changeset 1055:33d4ad53c049

Completes task #12688: Update views to Tryton 2.8 Use separate XML files for views https://savannah.gnu.org/task/?12688
author Bruno M. Villasanti <bvillasanti@thymbra.com>
date Wed, 09 Oct 2013 02:46:02 -0300
parents dec1124af471
children 16428348eb7b
files tryton/health/health_view.xml tryton/health/setup.py tryton/health/view/address_tree.xml tryton/health/view/appointments_report_open_start_form.xml tryton/health/view/appointments_report_tree.xml tryton/health/view/gnuhealth_alternative_identification_form.xml tryton/health/view/gnuhealth_alternative_identification_tree.xml tryton/health/view/gnuhealth_appointment_form.xml tryton/health/view/gnuhealth_appointment_tree.xml tryton/health/view/gnuhealth_diagnostic_hypothesis_form.xml tryton/health/view/gnuhealth_diagnostic_hypothesis_tree.xml tryton/health/view/gnuhealth_directions_form.xml tryton/health/view/gnuhealth_directions_tree.xml tryton/health/view/gnuhealth_disease_group_members.xml tryton/health/view/gnuhealth_disease_group_members_tree.xml tryton/health/view/gnuhealth_dosage.xml tryton/health/view/gnuhealth_dosage_tree.xml tryton/health/view/gnuhealth_dose.xml tryton/health/view/gnuhealth_dose_tree.xml tryton/health/view/gnuhealth_drug_form.xml tryton/health/view/gnuhealth_drug_form_tree.xml tryton/health/view/gnuhealth_drug_route.xml tryton/health/view/gnuhealth_drug_route_tree.xml tryton/health/view/gnuhealth_du.xml tryton/health/view/gnuhealth_du_tree.xml tryton/health/view/gnuhealth_ethnicity.xml tryton/health/view/gnuhealth_ethnicity_tree.xml tryton/health/view/gnuhealth_family.xml tryton/health/view/gnuhealth_family_member.xml tryton/health/view/gnuhealth_family_member_tree.xml tryton/health/view/gnuhealth_family_tree.xml tryton/health/view/gnuhealth_hospital_bed.xml tryton/health/view/gnuhealth_hospital_bed_tree.xml tryton/health/view/gnuhealth_hospital_building.xml tryton/health/view/gnuhealth_hospital_building_tree.xml tryton/health/view/gnuhealth_hospital_or.xml tryton/health/view/gnuhealth_hospital_or_tree.xml tryton/health/view/gnuhealth_hospital_unit.xml tryton/health/view/gnuhealth_hospital_unit_tree.xml tryton/health/view/gnuhealth_hospital_ward.xml tryton/health/view/gnuhealth_hospital_ward_tree.xml tryton/health/view/gnuhealth_hp_specialty.xml tryton/health/view/gnuhealth_hp_specialty_tree.xml tryton/health/view/gnuhealth_insurance_form.xml tryton/health/view/gnuhealth_insurance_plan.xml tryton/health/view/gnuhealth_insurance_plan_tree.xml tryton/health/view/gnuhealth_insurance_tree.xml tryton/health/view/gnuhealth_medicament_category_form.xml tryton/health/view/gnuhealth_medicament_category_list.xml tryton/health/view/gnuhealth_medicament_category_tree.xml tryton/health/view/gnuhealth_medicament_form.xml tryton/health/view/gnuhealth_medicament_tree.xml tryton/health/view/gnuhealth_occupation.xml tryton/health/view/gnuhealth_occupation_tree.xml tryton/health/view/gnuhealth_operational_area.xml tryton/health/view/gnuhealth_operational_area_tree.xml tryton/health/view/gnuhealth_operational_sector.xml tryton/health/view/gnuhealth_operational_sector_tree.xml tryton/health/view/gnuhealth_pathology.xml tryton/health/view/gnuhealth_pathology_category_form.xml tryton/health/view/gnuhealth_pathology_category_list.xml tryton/health/view/gnuhealth_pathology_category_tree.xml tryton/health/view/gnuhealth_pathology_group_form.xml tryton/health/view/gnuhealth_pathology_group_tree.xml tryton/health/view/gnuhealth_pathology_tree.xml tryton/health/view/gnuhealth_patient_diseases_form.xml tryton/health/view/gnuhealth_patient_diseases_tree.xml tryton/health/view/gnuhealth_patient_evaluation.xml tryton/health/view/gnuhealth_patient_evaluation_tree.xml tryton/health/view/gnuhealth_patient_form.xml tryton/health/view/gnuhealth_patient_medication_form.xml tryton/health/view/gnuhealth_patient_medication_tree.xml tryton/health/view/gnuhealth_patient_tree.xml tryton/health/view/gnuhealth_physician.xml tryton/health/view/gnuhealth_physician_tree.xml tryton/health/view/gnuhealth_prescription.xml tryton/health/view/gnuhealth_prescription_line.xml tryton/health/view/gnuhealth_prescription_line_tree.xml tryton/health/view/gnuhealth_prescription_tree.xml tryton/health/view/gnuhealth_procedure_form.xml tryton/health/view/gnuhealth_procedure_tree.xml tryton/health/view/gnuhealth_product_form.xml tryton/health/view/gnuhealth_product_tree.xml tryton/health/view/gnuhealth_secondary_condition_form.xml tryton/health/view/gnuhealth_secondary_condition_tree.xml tryton/health/view/gnuhealth_signs_and_symptoms_form.xml tryton/health/view/gnuhealth_signs_and_symptoms_tree.xml tryton/health/view/gnuhealth_specialty.xml tryton/health/view/gnuhealth_specialty_tree.xml tryton/health/view/gnuhealth_vaccination_form.xml tryton/health/view/gnuhealth_vaccination_tree.xml tryton/health/view/party_address_form.xml tryton/health/view/party_form.xml tryton/health/view/party_tree.xml tryton/health_calendar/health_calendar_view.xml tryton/health_calendar/setup.py tryton/health_calendar/view/gnuhealth_calendar_appointment.xml tryton/health_calendar/view/gnuhealth_calendar_physician.xml tryton/health_genetics/health_genetics_view.xml tryton/health_genetics/setup.py tryton/health_genetics/view/gnuhealth_disease_gene.xml tryton/health_genetics/view/gnuhealth_disease_gene_tree.xml tryton/health_genetics/view/gnuhealth_family_diseases.xml tryton/health_genetics/view/gnuhealth_family_diseases_tree.xml tryton/health_genetics/view/gnuhealth_genetic_risk.xml tryton/health_genetics/view/gnuhealth_genetic_risk_tree.xml tryton/health_genetics/view/gnuhealth_patient.xml tryton/health_gyneco/health_gyneco_view.xml tryton/health_gyneco/setup.py tryton/health_gyneco/view/gnuhealth_colposcopy_history.xml tryton/health_gyneco/view/gnuhealth_colposcopy_history_tree.xml tryton/health_gyneco/view/gnuhealth_mammography_history.xml tryton/health_gyneco/view/gnuhealth_mammography_history_tree.xml tryton/health_gyneco/view/gnuhealth_menstrual_history.xml tryton/health_gyneco/view/gnuhealth_menstrual_history_tree.xml tryton/health_gyneco/view/gnuhealth_pap_history.xml tryton/health_gyneco/view/gnuhealth_pap_history_tree.xml tryton/health_gyneco/view/gnuhealth_patient.xml tryton/health_gyneco/view/gnuhealth_patient_pregnancy.xml tryton/health_gyneco/view/gnuhealth_patient_pregnancy_tree.xml tryton/health_gyneco/view/gnuhealth_perinatal.xml tryton/health_gyneco/view/gnuhealth_perinatal_monitor.xml tryton/health_gyneco/view/gnuhealth_perinatal_monitor_tree.xml tryton/health_gyneco/view/gnuhealth_perinatal_tree.xml tryton/health_gyneco/view/gnuhealth_prenatal_evaluation.xml tryton/health_gyneco/view/gnuhealth_prenatal_evaluation_tree.xml tryton/health_gyneco/view/gnuhealth_puerperium_monitor.xml tryton/health_gyneco/view/gnuhealth_puerperium_monitor_tree.xml tryton/health_icu/health_icu_view.xml tryton/health_icu/setup.py tryton/health_icu/view/gnuhealth_icu_apache2_form.xml tryton/health_icu/view/gnuhealth_icu_apache2_tree.xml tryton/health_icu/view/gnuhealth_icu_chest_drainage_form.xml tryton/health_icu/view/gnuhealth_icu_chest_drainage_tree.xml tryton/health_icu/view/gnuhealth_icu_ecg_form.xml tryton/health_icu/view/gnuhealth_icu_ecg_tree.xml tryton/health_icu/view/gnuhealth_icu_glasgow_form.xml tryton/health_icu/view/gnuhealth_icu_glasgow_tree.xml tryton/health_icu/view/gnuhealth_icu_ventilation_form.xml tryton/health_icu/view/gnuhealth_icu_ventilation_tree.xml tryton/health_icu/view/gnuhealth_inpatient_icu_form.xml tryton/health_icu/view/gnuhealth_inpatient_icu_tree.xml tryton/health_icu/view/gnuhealth_patient_icu_rounding.xml tryton/health_imaging/health_imaging_view.xml tryton/health_imaging/setup.py tryton/health_imaging/view/imaging_test_form.xml tryton/health_imaging/view/imaging_test_request_form.xml tryton/health_imaging/view/imaging_test_request_tree.xml tryton/health_imaging/view/imaging_test_result_form.xml tryton/health_imaging/view/imaging_test_result_tree.xml tryton/health_imaging/view/imaging_test_tree.xml tryton/health_imaging/view/imaging_test_type_form.xml tryton/health_imaging/view/imaging_test_type_tree.xml tryton/health_imaging/view/patient_imaging_test_request_start_form.xml tryton/health_inpatient/health_inpatient_view.xml tryton/health_inpatient/setup.py tryton/health_inpatient/view/gnuhealth_bed_transfer_form.xml tryton/health_inpatient/view/gnuhealth_bed_transfer_tree.xml tryton/health_inpatient/view/gnuhealth_inpatient_diet_belief_form.xml tryton/health_inpatient/view/gnuhealth_inpatient_diet_belief_tree.xml tryton/health_inpatient/view/gnuhealth_inpatient_diet_form.xml tryton/health_inpatient/view/gnuhealth_inpatient_diet_therapeutic_form.xml tryton/health_inpatient/view/gnuhealth_inpatient_diet_therapeutic_tree.xml tryton/health_inpatient/view/gnuhealth_inpatient_diet_tree.xml tryton/health_inpatient/view/gnuhealth_inpatient_med_admin_time_form.xml tryton/health_inpatient/view/gnuhealth_inpatient_med_admin_time_tree.xml tryton/health_inpatient/view/gnuhealth_inpatient_med_log_form.xml tryton/health_inpatient/view/gnuhealth_inpatient_med_log_tree.xml tryton/health_inpatient/view/gnuhealth_inpatient_medication_form.xml tryton/health_inpatient/view/gnuhealth_inpatient_medication_tree.xml tryton/health_inpatient/view/gnuhealth_inpatient_registration.xml tryton/health_inpatient/view/gnuhealth_inpatient_registration_tree.xml tryton/health_inpatient/view/gnuhealth_patient_extd_tree.xml tryton/health_inpatient/view/partner_form.xml tryton/health_inpatient/view/patient_form.xml tryton/health_inpatient_calendar/health_inpatient_calendar_view.xml tryton/health_inpatient_calendar/setup.py tryton/health_inpatient_calendar/view/gnuhealth_calendar_hospital_bed.xml tryton/health_inpatient_calendar/view/gnuhealth_calendar_inpatient_registration.xml tryton/health_lab/health_lab_view.xml tryton/health_lab/setup.py tryton/health_lab/view/gnuhealth_lab.xml tryton/health_lab/view/gnuhealth_lab_test.xml tryton/health_lab/view/gnuhealth_lab_test_request_form.xml tryton/health_lab/view/gnuhealth_lab_test_request_tree.xml tryton/health_lab/view/gnuhealth_lab_test_tree.xml tryton/health_lab/view/gnuhealth_lab_tree.xml tryton/health_lab/view/gnuhealth_lab_unit_form.xml tryton/health_lab/view/gnuhealth_lab_unit_tree.xml tryton/health_lab/view/test_critearea_form_lab.xml tryton/health_lab/view/test_critearea_form_test_type.xml tryton/health_lab/view/test_critearea_tree_lab.xml tryton/health_lab/view/test_critearea_tree_test_type.xml tryton/health_lifestyle/health_lifestyle_view.xml tryton/health_lifestyle/setup.py tryton/health_lifestyle/view/gnuhealth_drugs_recreational.xml tryton/health_lifestyle/view/gnuhealth_drugs_recreational_tree.xml tryton/health_lifestyle/view/gnuhealth_patient.xml tryton/health_lifestyle/view/gnuhealth_patient_cage.xml tryton/health_lifestyle/view/gnuhealth_patient_cage_tree.xml tryton/health_lifestyle/view/gnuhealth_recreational_drugs.xml tryton/health_lifestyle/view/gnuhealth_recreational_drugs_tree.xml tryton/health_ntd_chagas/health_ntd_chagas_view.xml tryton/health_ntd_chagas/setup.py tryton/health_ntd_chagas/view/gnuhealth_chagas_du_survey_form.xml tryton/health_ntd_chagas/view/gnuhealth_chagas_du_survey_tree.xml tryton/health_ntd_dengue/health_ntd_dengue_view.xml tryton/health_ntd_dengue/setup.py tryton/health_ntd_dengue/view/gnuhealth_dengue_du_survey_form.xml tryton/health_ntd_dengue/view/gnuhealth_dengue_du_survey_tree.xml tryton/health_nursing/health_nursing_view.xml tryton/health_nursing/setup.py tryton/health_nursing/view/gnuhealth_ambulatory_care.xml tryton/health_nursing/view/gnuhealth_ambulatory_procedure_tree.xml tryton/health_nursing/view/gnuhealth_patient_ambulatory_care.xml tryton/health_nursing/view/gnuhealth_patient_ambulatory_care_tree.xml tryton/health_nursing/view/gnuhealth_patient_rounding.xml tryton/health_nursing/view/gnuhealth_patient_rounding_tree.xml tryton/health_nursing/view/gnuhealth_procedure_tree.xml tryton/health_nursing/view/gnuhealth_rounding.xml tryton/health_pediatrics/health_pediatrics_view.xml tryton/health_pediatrics/setup.py tryton/health_pediatrics/view/gnuhealth_neonatal_apgar.xml tryton/health_pediatrics/view/gnuhealth_neonatal_apgar_tree.xml tryton/health_pediatrics/view/gnuhealth_newborn.xml tryton/health_pediatrics/view/gnuhealth_newborn_tree.xml tryton/health_pediatrics/view/gnuhealth_pediatric_symptoms_checklist.xml tryton/health_pediatrics/view/gnuhealth_pediatric_symptoms_checklist_tree.xml tryton/health_qrcodes/health_qrcodes_view.xml tryton/health_qrcodes/setup.py tryton/health_qrcodes/view/gnuhealth_patient_form.xml tryton/health_qrcodes/view/newborn_form.xml tryton/health_reporting/health_reporting.xml tryton/health_reporting/setup.py tryton/health_reporting/view/evaluations_doctor_graph.xml tryton/health_reporting/view/evaluations_doctor_monthly_tree.xml tryton/health_reporting/view/evaluations_doctor_open_start_form.xml tryton/health_reporting/view/evaluations_doctor_tree.xml tryton/health_reporting/view/evaluations_doctor_weekly_tree.xml tryton/health_reporting/view/evaluations_sector_graph.xml tryton/health_reporting/view/evaluations_sector_monthly_tree.xml tryton/health_reporting/view/evaluations_sector_open_start_form.xml tryton/health_reporting/view/evaluations_sector_tree.xml tryton/health_reporting/view/evaluations_sector_weekly_tree.xml tryton/health_reporting/view/evaluations_specialty_graph.xml tryton/health_reporting/view/evaluations_specialty_monthly_tree.xml tryton/health_reporting/view/evaluations_specialty_open_start_form.xml tryton/health_reporting/view/evaluations_specialty_tree.xml tryton/health_reporting/view/evaluations_specialty_weekly_tree.xml tryton/health_reporting/view/top_diseases_graph.xml tryton/health_reporting/view/top_diseases_open_start_form.xml tryton/health_reporting/view/top_diseases_tree.xml tryton/health_services/health_services_view.xml tryton/health_services/setup.py tryton/health_services/view/gnuhealth_health_service.xml tryton/health_services/view/gnuhealth_health_service_line.xml tryton/health_services/view/gnuhealth_health_service_line_tree.xml tryton/health_services/view/gnuhealth_health_service_tree.xml tryton/health_socioeconomics/health_socioeconomics_view.xml tryton/health_socioeconomics/setup.py tryton/health_socioeconomics/view/gnuhealth_patient.xml tryton/health_socioeconomics/view/party_form.xml tryton/health_stock/health_stock.xml tryton/health_stock/setup.py tryton/health_stock/view/ambulatory_care_form.xml tryton/health_stock/view/create_prescription_stock_move.xml tryton/health_stock/view/gnuhealth_ambulatory_care_medical_supplies_tree.xml tryton/health_stock/view/gnuhealth_ambulatory_care_medicament_form.xml tryton/health_stock/view/gnuhealth_ambulatory_care_medicament_tree.xml tryton/health_stock/view/gnuhealth_ambulatory_care_vaccine_form.xml tryton/health_stock/view/gnuhealth_ambulatory_care_vaccine_tree.xml tryton/health_stock/view/gnuhealth_medicament_tree_stock.xml tryton/health_stock/view/gnuhealth_patient_ambulatory_care_tree.xml tryton/health_stock/view/gnuhealth_patient_rounding.xml tryton/health_stock/view/gnuhealth_patient_rounding_tree.xml tryton/health_stock/view/gnuhealth_rounding_medical_supply_tree.xml tryton/health_stock/view/gnuhealth_rounding_medicament_form.xml tryton/health_stock/view/gnuhealth_rounding_medicament_tree.xml tryton/health_stock/view/gnuhealth_rounding_vaccine_form.xml tryton/health_stock/view/gnuhealth_rounding_vaccine_tree.xml tryton/health_stock/view/lot_form.xml tryton/health_stock/view/lot_tree.xml tryton/health_stock/view/move_form.xml tryton/health_stock/view/move_tree.xml tryton/health_stock/view/party_form.xml tryton/health_surgery/health_surgery_view.xml tryton/health_surgery/setup.py tryton/health_surgery/view/gnuhealth_operation.xml tryton/health_surgery/view/gnuhealth_operation_tree.xml tryton/health_surgery/view/gnuhealth_patient.xml tryton/health_surgery/view/gnuhealth_procedure.xml tryton/health_surgery/view/gnuhealth_procedure_tree.xml tryton/health_surgery/view/gnuhealth_rcri_form.xml tryton/health_surgery/view/gnuhealth_rcri_tree.xml tryton/health_surgery/view/gnuhealth_surgery.xml tryton/health_surgery/view/gnuhealth_surgery_tree.xml
diffstat 296 files changed, 4678 insertions(+), 5572 deletions(-) [+]
line wrap: on
line diff
--- a/tryton/health/health_view.xml
+++ b/tryton/health/health_view.xml
@@ -101,34 +101,13 @@
         <record model="ir.ui.view" id="gnuhealth_dosage_view">
             <field name="model">gnuhealth.medication.dosage</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Dosage">
-                    <group id="dosage_header">
-                        <label name="name"/>
-                        <field name="name"/>
-                        <label name="code"/>
-                        <field name="code"/>
-                        <label name="abbreviation"/>
-                        <field name="abbreviation"/>
-                    </group>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_dosage</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_dosage_tree">
             <field name="model">gnuhealth.medication.dosage</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Dosages">
-                    <field name="name" expand="1"/>
-                    <field name="code" expand="1"/>
-                    <field name="abbreviation" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_dosage_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="gnuhealth_action_dosage">
@@ -156,31 +135,13 @@
         <record model="ir.ui.view" id="gnuhealth_dose_view">
             <field name="model">gnuhealth.dose.unit</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="dose">
-                    <group id="dose_header">
-                        <label name="name"/>
-                        <field name="name"/>
-                        <label name="desc"/>
-                        <field name="desc"/>
-                    </group>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_dose</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_dose_tree">
             <field name="model">gnuhealth.dose.unit</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="doses">
-                    <field name="name" expand="1"/>
-                    <field name="desc" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_dose_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="gnuhealth_action_dose">
@@ -208,31 +169,13 @@
         <record model="ir.ui.view" id="gnuhealth_drug_route_view">
             <field name="model">gnuhealth.drug.route</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Drug Form">
-                    <group id="drug_route_header">
-                        <label name="name"/>
-                        <field name="name"/>
-                        <label name="code"/>
-                        <field name="code"/>
-                    </group>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_drug_route</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_drug_route_tree">
             <field name="model">gnuhealth.drug.route</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Drug Forms">
-                    <field name="name" expand="1"/>
-                    <field name="code" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_drug_route_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="gnuhealth_action_drug_route">
@@ -260,31 +203,13 @@
         <record model="ir.ui.view" id="gnuhealth_drug_form_view">
             <field name="model">gnuhealth.drug.form</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Drug Form">
-                    <group id="drug_form_header">
-                        <label name="name"/>
-                        <field name="name"/>
-                        <label name="code"/>
-                        <field name="code"/>
-                    </group>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_drug_form</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_drug_form_tree">
             <field name="model">gnuhealth.drug.form</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Drug Forms">
-                    <field name="name" expand="1"/>
-                    <field name="code" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_drug_route_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="gnuhealth_action_drug_form">
@@ -312,31 +237,13 @@
         <record model="ir.ui.view" id="gnuhealth_occupation_view">
             <field name="model">gnuhealth.occupation</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="occupation">
-                    <group id="occupation_header">
-                        <label name="name"/>
-                        <field name="name"/>
-                        <label name="code"/>
-                        <field name="code"/>
-                    </group>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_occupation</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_occupation_tree">
             <field name="model">gnuhealth.occupation</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Occupations">
-                    <field name="name" expand="1"/>
-                    <field name="code" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_occupation_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="gnuhealth_action_occupation">
@@ -364,34 +271,13 @@
         <record model="ir.ui.view" id="gnuhealth_ethnicity_view">
             <field name="model">gnuhealth.ethnicity</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="ethnicity">
-                    <group id="ethnicity_header">
-                        <label name="name"/>
-                        <field name="name"/>
-                        <label name="code"/>
-                        <field name="code"/>
-                        <label name="notes"/>
-                        <field name="notes"/>
-                    </group>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_ethnicity</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_ethnicity_tree">
             <field name="model">gnuhealth.ethnicity</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Ethnicities">
-                    <field name="name" expand="1"/>
-                    <field name="code" expand="1"/>
-                    <field name="notes" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_ethnicity_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="gnuhealth_action_ethnicity">
@@ -419,31 +305,13 @@
         <record model="ir.ui.view" id="gnuhealth_specialty_view">
             <field name="model">gnuhealth.specialty</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="specialty">
-                    <group id="specialty_header">
-                        <label name="name"/>
-                        <field name="name"/>
-                        <label name="code"/>
-                        <field name="code"/>
-                    </group>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_specialty</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_specialty_tree">
             <field name="model">gnuhealth.specialty</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Medical Specialties">
-                    <field name="name" expand="1"/>
-                    <field name="code" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_specialty_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="gnuhealth_action_specialty">
@@ -471,42 +339,13 @@
         <record model="ir.ui.view" id="gnuhealth_physician_view">
             <field name="model">gnuhealth.physician</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="physician">
-                    <group col="8" colspan="4" id="general_info">
-                        <label name="name"/>
-                        <field name="name"/>
-                        <label name="institution"/>
-                        <field name="institution"/>
-                        <label name="main_specialty"/>
-                        <field name="main_specialty"/>
-                        <label name="code"/>
-                        <field name="code"/>
-                    </group>
-                    <newline/>
-                    <field name="specialties"/>
-                    <newline/>
-                    <separator string="Extra Info" id="physician_extra_info"/>
-                    <newline/>
-                    <field name="info" colspan="4"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_physician</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_physician_tree">
             <field name="model">gnuhealth.physician</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Health Professionals">
-                    <field name="name" expand="1"/>
-                    <field name="code" expand="1"/>
-                    <field name="institution" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_physician_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="gnuhealth_action_physician">
@@ -536,29 +375,13 @@
         <record model="ir.ui.view" id="gnuhealth_hp_specialty_view">
             <field name="model">gnuhealth.hp_specialty</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Health Professional Specialties">
-                    <label name="name"/>
-                    <field name="name"/>
-                    <label name="specialty"/>
-                    <field name="specialty"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_hp_specialty</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_hp_specialty_tree">
             <field name="model">gnuhealth.hp_specialty</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Health Professional Specialties">
-                    <field name="specialty"/>
-                    <field name="name"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_hp_specialty_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="gnuhealth_action_hp_specialty">
@@ -581,37 +404,13 @@
         <record model="ir.ui.view" id="gnuhealth_family_view">
             <field name="model">gnuhealth.family</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Family">
-                    <group id="family_header">
-                        <label name="name"/>
-                        <field name="name"/>
-                    </group>
-                    <newline/>
-                    <separator string="Members" id="members"/>
-                    <newline/>
-                    <field name="members"/>
-                    <newline/>
-                    <separator string="Extra Info" id="extra_info"/>
-                    <newline/>
-                    <field name="info"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_family</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_family_tree">
             <field name="model">gnuhealth.family</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Families">
-                    <field name="name" expand="1"/>
-                    <field name="info" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_family_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="gnuhealth_action_family">
@@ -639,30 +438,13 @@
         <record model="ir.ui.view" id="gnuhealth_family_member_view">
             <field name="model">gnuhealth.family_member</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Family Member">
-                    <label name="party"/>
-                    <field name="party"/>
-                    <label name="role"/>
-                    <field name="role"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_family_member</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_family_member_tree">
             <field name="model">gnuhealth.family_member</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Family Members">
-                    <field name="name" expand="1"/>
-                    <field name="party" expand="1"/>
-                    <field name="role" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_family_member_tree</field>
         </record>
 
 <!-- Make the Family Member list read only, to enter a new one will be done from the family model -->
@@ -689,114 +471,13 @@
         <record model="ir.ui.view" id="gnuhealth_du_view">
             <field name="model">gnuhealth.du</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Domicilary Unit">
-                    <group id="du_header">
-                        <group col="6" id="du_address">
-                            <label name="name"/>
-                            <field name="name"/>
-                            <label name="desc"/>
-                            <field colspan="3" name="desc"/>
-                            <newline/>
-                            <label name="address_street"/>
-                            <field name="address_street"/>
-                            <label name="address_street_number"/>
-                            <field name="address_street_number"/>
-                            <label name="address_street_bis"/>
-                            <field name="address_street_bis"/>
-                            <label name="address_district"/>
-                            <field name="address_district"/>
-                            <label name="address_municipality"/>
-                            <field name="address_municipality"/>
-                            <label name="address_city"/>
-                            <field name="address_city"/>
-                            <label name="address_zip"/>
-                            <field name="address_zip"/>
-                            <label name="address_country"/>
-                            <field name="address_country"/>
-                            <label name="address_subdivision"/>
-                            <field name="address_subdivision"/>
-                        </group>
-                        <group id="du_picture">
-                            <field xfill="0" xexpand="1" name="picture" img_width="200" img_height="200"
-                        height="200" width="200" widget="image"/>
-                        </group>
-                        <newline/>
-                        <group col="6" colspan="4" id="du_georef">
-                            <label name="latitude"/>
-                            <field name="latitude"/>
-                            <label name="longitude"/>
-                            <field name="longitude"/>
-                            <label name="urladdr"/>
-                            <field name="urladdr" widget="url"/>
-                        </group>
-
-
-                        <newline/>
-                        <group colspan="4" col="6" id="du_living_conditions">
-                            <label name="housing"/>
-                            <field name="housing"/>
-                            <label name="dwelling"/>
-                            <field name="dwelling"/>
-                        </group>
-
-                        <newline/>
-
-                        <group colspan="4" col="8" id="infrastructure" string="Infrastructure">
-                            <label name="materials"/>
-                            <field name="materials"/>
-                            <label name="roof_type"/>
-                            <field name="roof_type"/>
-
-                            <label name="total_surface"/>
-                            <field name="total_surface"/>
-                            <label name="bedrooms"/>
-                            <field name="bedrooms"/>
-                            <label name="bathrooms"/>
-                            <field name="bathrooms"/>
-                            <label name="water"/>
-                            <field name="water"/>
-                            <label name="sewers"/>
-                            <field name="sewers"/>
-                            <label name="electricity"/>
-                            <field name="electricity"/>
-                            <label name="gas"/>
-                            <field name="gas"/>
-                            <label name="telephone"/>
-                            <field name="telephone"/>
-                            <label name="internet"/>
-                            <field name="internet"/>
-                            <label name="television"/>
-                            <field name="television"/>
-
-                        </group>
-
-                            <label name="operational_sector"/>
-                            <field name="operational_sector"/>
-
-                    </group>
-                    <newline/>
-                    <field name="members"/>
-
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_du</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_du_tree">
             <field name="model">gnuhealth.du</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Domiciliary Units">
-                    <field name="name" expand="1"/>
-                    <field name="desc" expand="1"/>
-                    <field name="address_city" expand="1"/>
-                    <field name="address_country" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_du_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="gnuhealth_action_du">
@@ -827,30 +508,13 @@
         <record model="ir.ui.view" id="gnuhealth_operational_area_view">
             <field name="model">gnuhealth.operational_area</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Operational Area">
-                    <label name="name"/>
-                    <field name="name"/>
-                    <newline/>
-                    <field name="operational_sector" colspan="4"/>
-                    <field name="info" colspan="4"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_operational_area</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_operational_area_tree">
             <field name="model">gnuhealth.operational_area</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Operational Areas List">
-                    <field name="name" expand="1"/>
-                    <field name="info" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_operational_area_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="gnuhealth_action_operational_area">
@@ -882,35 +546,14 @@
         <record model="ir.ui.view" id="gnuhealth_operational_sector_view">
             <field name="model">gnuhealth.operational_sector</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Region Operational Sector">
-                    <label name="name"/>
-                    <field name="name"/>
-                    <newline/>
-                    <label name="operational_area"/>
-                    <field name="operational_area"/>
-                    <newline/>
-                    <label name="info"/>
-                    <field name="info" colspan="4"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_operational_sector</field>
         </record>
 
 
         <record model="ir.ui.view" id="gnuhealth_operational_sector_tree">
             <field name="model">gnuhealth.operational_sector</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Operational Sector List">
-                    <field name="name" expand="1"/>
-                    <field name="operational_area" expand="1"/>
-                    <field name="info" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_operational_sector_tree</field>
         </record>
 
 
@@ -941,100 +584,13 @@
         <record model="ir.ui.view" id="gnuhealth_medicament_form">
             <field name="model">gnuhealth.medicament</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="medicaments">
-                    <label name="name"/>
-                    <field name="name"/>
-                    <label name="category"/>
-                    <field name="category"/>
-                    <newline/>
-<!--
-                    <label name="therapeutic_action"/>
-                    <field name="therapeutic_action"/>
--->
-                    <label name="active_component"/>
-                    <field name="active_component"/>
-                    <newline/>
-
-                    <notebook>
-
-                        <page string="Main Info" id="medicament_main">
-                            <separator string="Indications" colspan="4"
-                                id="separator_medication_indication"/>
-                            <newline/>
-                            <field name="indications" colspan="4"/>
-                        </page>
-
-                        <page string="Presentation" id="medicament_presentation">
-                            <label name="presentation"/>
-                            <field name="presentation"/>
-                        </page>
-
-                        <page string="Composition" id="medicament_composition">
-                            <label name="composition"/>
-                            <field name="composition"/>
-                        </page>
-
-                        <page string="Dosage" id="medicament_dosage">
-                            <label name="dosage"/>
-                            <field name="dosage"/>
-                            <newline/>
-                            <label name="overdosage"/>
-                            <field name="overdosage"/>
-                        </page>
-
-                        <page string="Pregnancy" id="medicament_pregnancy">
-                            <label name="pregnancy_warning"/>
-                            <field name="pregnancy_warning"/>
-                            <label name="pregnancy_category"/>
-                            <field name="pregnancy_category"/>
-                            <newline/>
-                            <separator string="Notes" id="pregnancy_notes" colspan="4"/>
-                            <newline/>
-                            <field colspan="4" name="pregnancy"/>
-                        </page>
-
-                        <page string="Adverse Reactions" id="medicament_adverse_reactions">
-                            <label name="adverse_reaction"/>
-                            <field name="adverse_reaction"/>
-                        </page>
-
-                        <page string="Storage" id="medicament_storage">
-                            <label name="storage"/>
-                            <field name="storage"/>
-                        </page>
-
-                        <page string="Extra Info" id="medicament_extra_info">
-                            <label name="notes"/>
-                            <field name="notes"/>
-                        </page>
-
-                    </notebook>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_medicament_form</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_medicament_tree">
             <field name="model">gnuhealth.medicament</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="medicament"
-                    colors="If(Equal(Eval('pregnancy_category'), 'X'), 'red',
-                    If(Equal(Eval('pregnancy_category'), 'D'), 'brown',
-                    If(Equal(Eval('pregnancy_category'), 'C'), 'orange',
-                    If(Equal(Eval('pregnancy_category'), 'N'), 'black', 'blue'))))">
-                    <field name="name" expand="1"/>
-                    <field name="active_component" expand="1"/>
-                    <field name="category"/>
-                    <field name="pregnancy_warning" expand="1"/>
-                    <field name="pregnancy_category" expand="1"/>
-                    <field name="adverse_reaction" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_medicament_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="gnuhealth_action_view_medicament">
@@ -1087,41 +643,20 @@
        <record model="ir.ui.view" id="gnuhealth_medicament_category_form">
             <field name="model">gnuhealth.medicament.category</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Medicament categories">
-                    <field name="name"/>
-                    <field name="parent"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_medicament_category_form</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_medicament_category_list">
             <field name="model">gnuhealth.medicament.category</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Medicament Categories">
-                    <field name="name" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_medicament_category_list</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_medicament_category_tree">
             <field name="model">gnuhealth.medicament.category</field>
             <field name="type">tree</field>
             <field name="field_childs">childs</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Medicament Categories" keyword_open="1">
-                    <field name="name" expand="1"/>
-                    <field name="parent" tree_invisible="1"/>
-                    <field name="childs" tree_invisible="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_medicament_category_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="action_gnuhealth_medicament_category_tree">
@@ -1151,42 +686,13 @@
         <record model="ir.ui.view" id="gnuhealth_pathology_group_form">
             <field name="model">gnuhealth.pathology.group</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Pathology Groups">
-                    <group id="pathology_group_header">
-                        <label name="name"/>
-                        <field name="name"/>
-                        <newline/>
-                        <label name="code"/>
-                        <field name="code"/>
-                        <label name="desc"/>
-                        <field name="desc"/>
-                        <newline/>
-                    </group>
-                    <separator string="Extra Information" colspan="4"
-                        id="pathology_groups_info"/>
-                    <group id="pathology_groups">
-                        <newline/>
-                        <field name="info" colspan="4"/>
-                    </group>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_pathology_group_form</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_pathology_group_tree">
             <field name="model">gnuhealth.pathology.group</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Pathology Groups">
-                    <field name="name" expand="1"/>
-                    <field name="code" expand="1"/>
-                    <field name="desc" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_pathology_group_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="gnuhealth_action_pathology_group">
@@ -1217,26 +723,13 @@
         <record model="ir.ui.view" id="gnuhealth_disease_group_members_view">
             <field name="model">gnuhealth.disease_group.members</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Pathology Group Member">
-                    <label name="disease_group"/>
-                    <field name="disease_group"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_disease_group_members</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_disease_group_members_tree">
             <field name="model">gnuhealth.disease_group.members</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Member of Pathology Groups">
-                    <field name="disease_group" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_disease_group_members_tree</field>
         </record>
 
 
@@ -1245,55 +738,13 @@
         <record model="ir.ui.view" id="gnuhealth_pathology_view">
             <field name="model">gnuhealth.pathology</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Pathology Info">
-                    <notebook>
-
-                        <page string="Main" id="disease_main">
-                            <group colspan="4" col="6" id="pathology_header">
-                                <label name="name"/>
-                                <field name="name"/>
-                                <label name="code"/>
-                                <field name="code"/>
-                                <label name="category"/>
-                                <field name="category"/>
-                            </group>
-                            <newline/>
-                            <field name="groups"/>
-                        </page>
-
-                        <page string="Genetics" id="disease_genetics">
-                            <label name="chromosome"/>
-                            <field name="chromosome"/>
-                            <label name="protein"/>
-                            <field name="protein"/>
-                            <label name="gene"/>
-                            <field name="gene"/>
-                        </page>
-
-                        <page string="Extra Info" id="disease_extra_info">
-                            <field name="info"/>
-                        </page>
-
-                    </notebook>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_pathology</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_pathology_tree">
             <field name="model">gnuhealth.pathology</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Pathology">
-                    <field name="name" expand="1"/>
-                    <field name="code" expand="1"/>
-                    <field name="category" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_pathology_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="gnuhealth_action_form_pathology">
@@ -1325,40 +776,19 @@
         <record model="ir.ui.view" id="gnuhealth_pathology_category_form">
             <field name="model">gnuhealth.pathology.category</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Disease categories">
-                    <field name="name"/>
-                    <field name="parent"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_pathology_category_form</field>
         </record>
         <record model="ir.ui.view" id="gnuhealth_pathology_category_list">
             <field name="model">gnuhealth.pathology.category</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Disease Categories">
-                    <field name="name" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_pathology_category_list</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_pathology_category_tree">
             <field name="model">gnuhealth.pathology.category</field>
             <field name="type">tree</field>
             <field name="field_childs">childs</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Disease Categories" keyword_open="1">
-                    <field name="name" expand="1"/>
-                    <field name="parent" tree_invisible="1"/>
-                    <field name="childs" tree_invisible="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_pathology_category_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="action_gnuhealth_pathology_category_tree">
@@ -1394,55 +824,13 @@
         <record model="ir.ui.view" id="gnuhealth_insurance_view_form">
             <field name="model">gnuhealth.insurance</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Insurances">
-                    <group col="6" colspan="4" id="insurance_header">
-                        <label name="number"/>
-                        <field name="number"/>
-                        <label name="name"/>
-                        <field name="name"/>
-                        <label name="insurance_type"/>
-                        <field name="insurance_type" widget="selection"/>
-                    </group>
-                    <newline/>
-                    <group col="6" colspan="4" id="insurance_plan">
-                        <label name="company"/>
-                        <field name="company"/>
-                        <label name="plan_id"/>
-                        <field name="plan_id"/>
-                        <label name="category"/>
-                        <field name="category"/>
-                    </group>
-                    <newline/>
-                    <label name="member_since"/>
-                    <field name="member_since"/>
-                    <label name="member_exp"/>
-                    <field name="member_exp"/>
-                    <newline/>
-                    <field name="notes" colspan="4"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_insurance_form</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_insurance_view_tree">
             <field name="model">gnuhealth.insurance</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Insurance List">
-                    <field name="number" expand="1" />
-                    <field name="name" expand="1"/>
-                    <field name="plan_id"/>
-                    <field name="insurance_type"/>
-                    <field name="company"/>
-                    <field name="category"/>
-                    <field name="member_since"/>
-                    <field name="member_exp" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_insurance_tree</field>
         </record>
 
        <record model="ir.action.act_window" id="gnuhealth_action_insurance">
@@ -1471,34 +859,13 @@
         <record model="ir.ui.view" id="gnuhealth_insurance_plan_view">
             <field name="model">gnuhealth.insurance.plan</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Insurance Plans">
-                    <label name="name"/>
-                    <field name="name"/>
-                    <newline/>
-                    <label name="company"/>
-                    <field name="company"/>
-                    <label name="is_default"/>
-                    <field name="is_default"/>
-                    <newline/>
-                    <field name="notes" colspan="4"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_insurance_plan</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_insurance_plan_tree">
             <field name="model">gnuhealth.insurance.plan</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Insurance Plans">
-                    <field name="name" expand="1"/>
-                    <field name="is_default" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_insurance_plan_tree</field>
         </record>
 
 
@@ -1531,32 +898,13 @@
         <record model="ir.ui.view" id="gnuhealth_alternative_identification_form">
             <field name="model">gnuhealth.person_alternative_identification</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Person alternative IDs">
-                    <label name="code"/>
-                    <field name="code"/>
-                    <label name="alternative_id_type"/>
-                    <field name="alternative_id_type"/>
-                    <label name="comments"/>
-                    <field name="comments"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_alternative_identification_form</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_alternative_identification_tree">
             <field name="model">gnuhealth.person_alternative_identification</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree editable="top" string="Alternative ID">
-                    <field name="code" expand="1"/>
-                    <field name="alternative_id_type" expand="1"/>
-                    <field name="comments" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_alternative_identification_tree</field>
         </record>
 
 <!-- PARTY -->
@@ -1565,98 +913,7 @@
             <field name="model">party.party</field>
             <field name="inherit" ref="party.party_view_form"/>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/form/notebook/page[@id=&quot;general&quot;]"
-                        position="before">
-
-                        <page string="Health" id="party_gnuhealth">
-
-                            <group col="12" colspan="4" id="party_specs">
-                                <label name="is_person"/>
-                                <field name="is_person"/>
-                                <label name="is_patient"/>
-                                <field name="is_patient"/>
-                                <label name="is_doctor"/>
-                                <field name="is_doctor"/>
-                                <label name="is_institution"/>
-                                <field name="is_institution"/>
-                                <label name="is_insurance_company"/>
-                                <field name="is_insurance_company"/>
-                                <label name="is_pharmacy"/>
-                                <field name="is_pharmacy"/>
-                            </group>
-                            <newline/>
-
-                            <group colspan="4" id="person_details" states="{'invisible': Not(Bool(Eval('is_person')))}">
-                                <group id="person_demographics" string="Demographics">
-                                <label name="ref"/>
-                                <field name="ref"/>
-                                <label name="dob"/>
-                                <field name="dob"/>
-                                <label name="sex"/>
-                                <field name="sex"/>
-                                <label name="marital_status"/>
-                                <field name="marital_status"/>
-                                <label name="du"/>
-                                <field name="du"/>
-                                <label name="citizenship"/>
-                                <field name="citizenship"/>
-                                <label name="residence"/>
-                                <field name="residence"/>
-                                <label name="ethnic_group"/>
-                                <field name="ethnic_group"/>
-                                <label name="alternative_identification"/>
-                                <field name="alternative_identification"/>
-                                <label name="unidentified"/>
-                                <field name="unidentified"/>
-
-                                </group>
-
-                                <group string="Picture" id="person_picture">
-                                    <field xfill="0" xexpand="1" name="photo" img_width="200" img_height="200"
-                                height="200" width="200" widget="image"/>
-                                </group>
-                                <newline/>
-
-                            </group>
-
-
-                            <newline/>
-
-                            <field name="alternative_ids"/>
-
-                            <newline/>
-
-                            <group col="6" colspan="2" id="other_party_specs">
-                                <label name="activation_date"/>
-                                <field name="activation_date"/>
-                                <label name="internal_user"/>
-                                <field name="internal_user"/>
-                            </group>
-
-                            <newline/>
-
-                            <field name="insurance" colspan="4"/>
-
-                        </page>
-
-                    </xpath>
-
-                    <xpath
-                        expr="/form/field[@name=&quot;name&quot;]"
-                        position="after">
-                        <label name="lastname"/>
-                        <field name="lastname"/>
-                        <label name="alias"/>
-                        <field name="alias"/>
-                    </xpath>
-
-                </data>
-                ]]>
-            </field>
+            <field name="name">party_form</field>
         </record>
 
 
@@ -1665,24 +922,7 @@
         <record model="ir.ui.view" id="party_view_tree">
             <field name="model">party.party</field>
             <field name="inherit" ref="party.party_view_tree"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/tree/field[@name=&quot;name&quot;]"
-                        position="after">
-                        <field name="lastname" expand="1"/>
-                        <field name="ref" expand="1"/>
-                        <field name="is_person"/>
-                        <field name="is_patient"/>
-                        <field name="is_doctor"/>
-                        <field name="is_institution"/>
-                        <field name="is_pharmacy"/>
-                        <field name="is_insurance_company"/>
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">party_tree</field>
         </record>
 
 
@@ -1692,48 +932,13 @@
             <field name="model">party.address</field>
             <field name="inherit" ref="party.address_view_form"/>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/form/label[@name=&quot;party&quot;]"
-                        position="before">
-                        <newline/>
-
-                        <label name="relative_id"/>
-                        <field name="relative_id"/>
-                        <label name="relationship"/>
-                        <field name="relationship"/>
-                        <newline/>
-                    </xpath>
-                    <xpath
-                        expr="/form/group/field[@name=&quot;active&quot;]"
-                        position="after">
-                        <label name="is_work"/>
-                        <field name="is_work"/>
-                        <label name="is_school"/>
-                        <field name="is_school"/>
-                    </xpath>
-
-                </data>
-                ]]>
-            </field>
+            <field name="name">party_address_form</field>
         </record>
 
         <record model="ir.ui.view" id="address_view_tree">
             <field name="model">party.address</field>
             <field name="inherit" ref="party.address_view_tree"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/tree/field[@name=&quot;active&quot;]" position="after">
-                        <field name="is_school"/>
-                        <field name="is_work"/>
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">address_tree</field>
         </record>
 
 
@@ -1743,48 +948,12 @@
             <field name="model">product.product</field>
             <field name="inherit" ref="product.product_view_form"/>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/form/field[@name=&quot;active&quot;]"
-                        position="after">
-                        <separator string="Health" id="health" colspan="6"/>
-                        <group col="10" colspan="4" id="product_specs">
-                            <label name="is_medicament"/>
-                            <field name="is_medicament"/>
-                            <label name="is_medical_supply"/>
-                            <field name="is_medical_supply"/>
-                            <label name="is_vaccine"/>
-                            <field name="is_vaccine"/>
-                            <label name="is_bed"/>
-                            <field name="is_bed"/>
-                            <label name="is_insurance_plan"/>
-                            <field name="is_insurance_plan"/>
-                        </group>
-                </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_product_form</field>
         </record>
         <record model="ir.ui.view" id="view_gnuhealth_product_tree">
             <field name="model">product.product</field>
             <field name="inherit" ref="product.product_view_tree"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/tree/field[@name=&quot;rec_name&quot;]"
-                        position="after">
-                        <field name="is_medicament"/>
-                        <field name="is_medical_supply"/>
-                        <field name="is_vaccine"/>
-                        <field name="is_bed"/>
-                        <field name="is_insurance_plan"/>
-                </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_product_tree</field>
         </record>
 
 
@@ -1793,30 +962,13 @@
         <record model="ir.ui.view" id="gnuhealth_procedure_view_form">
             <field name="model">gnuhealth.procedure</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Procedure">
-                    <label name="name"/>
-                    <field name="name"/>
-                    <newline/>
-                    <label name="description"/>
-                    <field name="description"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_procedure_form</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_procedure_tree">
             <field name="model">gnuhealth.procedure</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Procedure">
-                    <field name="name" expand="1"/>
-                    <field name="description" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_procedure_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="action_gnuhealth_procedure_view">
@@ -1845,127 +997,13 @@
         <record model="ir.ui.view" id="gnuhealth_patient_medication_form">
             <field name="model">gnuhealth.patient.medication</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Medication">
-                    <notebook>
-
-                        <page string="General Info" id="medication_general_info">
-                            <group id="medication_header" string="Medication">
-                                <label name="medicament"/>
-                                <field name="medicament"/>
-                                <label name="indication"/>
-                                <field name="indication"/>
-                            </group>
-                            <newline/>
-                            <newline/>
-                            <group colspan="2" id="treatment_period"
-                                string="Treatment period">
-                                <label name="start_treatment"/>
-                                <field name="start_treatment"/>
-                                <label name="end_treatment"/>
-                                <field name="end_treatment"/>
-                            </group>
-                            <newline/>
-                            <newline/>
-                            <group id="treatment_status" string="Status">
-                                <label name="is_active"/>
-                                <field name="is_active"/>
-                                <label name="course_completed"/>
-                                <field name="course_completed"/>
-                                <label name="discontinued"/>
-                                <field name="discontinued"/>
-                                <label name="discontinued_reason"/>
-                                <field name="discontinued_reason"/>
-                            </group>
-                            <newline/>
-                            <group id="medication_adeverse_effects"
-                                string="Adverse Reactions and Notes">
-                                <field name="adverse_reaction"/>
-                                <newline/>
-                                <separator string="Notes" id="medication_notes"/>
-                                <newline/>
-                                <field name="notes"/>
-                            </group>
-                        </page>
-
-                        <page id="medication_misc" string="Extra Info">
-                            <group id="medicament_dosage_main">
-                                <group id="medicament_form"
-                                    string="Admnistration">
-                                    <label name="form"/>
-                                    <field name="form"/>
-                                    <label name="route"/>
-                                    <field name="route"/>
-                                </group>
-                                <newline/>
-                                <group id="medicament_dosage" col="6"
-                                    string="Dosage">
-                                    <label name="dose"/>
-                                    <field name="dose"/>
-                                    <label name="dose_unit"/>
-                                    <field name="dose_unit"/>
-                                    <label name="qty"/>
-                                    <field name="qty"/>
-                                </group>
-                                <newline/>
-                                <group id="medicament_duration"
-                                    string="Treatment duration">
-                                    <label name="duration"/>
-                                    <field name="duration"/>
-                                    <label name="duration_period"/>
-                                    <field name="duration_period"/>
-                                </group>
-                                <newline/>
-                                <group string="Common Dosage"
-                                    id="group_common_dosage">
-                                    <label name="common_dosage"/>
-                                    <field name="common_dosage"/>
-                                    <label name="admin_times"/>
-                                    <field name="admin_times"/>
-                                </group>
-                                <newline/>
-                                <group col="6" colspan="4"
-                                    string="Specific Dosage"
-                                    id="group_specific_dosage">
-                                    <label name="frequency"/>
-                                    <field name="frequency"/>
-                                    <label name="frequency_unit"/>
-                                    <field name="frequency_unit"/>
-                                    <label name="frequency_prn"/>
-                                    <field name="frequency_prn"/>
-                                </group>
-                            </group>
-                            <newline/>
-                            <group id="medication_notes"
-                                string="Prescribing doctor">
-                                <label name="doctor"/>
-                                <field name="doctor"/>
-                            </group>
-                        </page>
-
-                    </notebook>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_patient_medication_form</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_patient_medication_tree">
             <field name="model">gnuhealth.patient.medication</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Patient Medication"
-                    colors="If(Bool(Eval('is_active')),'blue','grey')">
-                    <field name="medicament" expand="1"/>
-                    <field name="start_treatment" expand="1"/>
-                    <field name="end_treatment" expand="1"/>
-                    <field name="course_completed"/>
-                    <field name="discontinued"/>
-                    <field name="is_active" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_patient_medication_tree</field>
         </record>
 
 
@@ -1974,62 +1012,13 @@
         <record model="ir.ui.view" id="gnuhealth_appointment_form">
             <field name="model">gnuhealth.appointment</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Appointment">
-                    <group colspan="4" col="6" id="appointment_header">
-                        <label name="name"/>
-                        <field name="name"/>
-                        <label name="institution"/>
-                        <field name="institution"/>
-                        <label name="patient"/>
-                        <field name="patient"/>
-                        <label name="appointment_date"/>
-                        <field name="appointment_date"/>
-                        <label name="visit_type"/>
-                        <field name="visit_type"/>
-                        <label name="urgency"/>
-                        <field name="urgency"/>
-                        <label name="appointment_type"/>
-                        <field name="appointment_type"/>
-                        <label name="state"/>
-                        <field name="state"/>
-
-                    </group>
-                    <newline/>
-                    <group colspan="4" id="doc_appointment_header">
-                        <label name="doctor"/>
-                        <field name="doctor"/>
-                        <label name="speciality"/>
-                        <field name="speciality"/>
-                    </group>
-                    <separator string="Information"
-                        id="sepatator_appointment_notes"/>
-                    <newline/>
-                    <field name="comments" colspan="4"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_appointment_form</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_appointment_tree">
             <field name="model">gnuhealth.appointment</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Patient appointment">
-                    <field name="name" expand="1"/>
-                    <field name="patient" expand="1"/>
-                    <field name="appointment_type" expand="1"/>
-                    <field name="urgency" expand="1"/>
-                    <field name="appointment_date"/>
-                    <field name="speciality"/>
-                    <field name="doctor"/>
-                    <field name="institution" expand="1"/>
-                    <field name="state"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_appointment_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="action_gnuhealth_appointment_view">
@@ -2089,20 +1078,7 @@
         <record model="ir.ui.view" id="appointments_report_view_tree">
             <field name="model">gnuhealth.appointment.report</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Appointments Report" keyword_open="1">
-                    <field name="identification_code"/>
-                    <field name="ref"/>
-                    <field name="patient"/>
-                    <field name="age"/>
-                    <field name="sex"/>
-                    <field name="address"/>
-                    <field name="insurance"/>
-                    <field name="diagnosis"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">appointments_report_tree</field>
         </record>
         <record model="ir.action.act_window"
             id="act_appointments_report_view_tree">
@@ -2119,16 +1095,7 @@
         <record model="ir.ui.view" id="appointments_report_open_start_view_form">
             <field name="model">gnuhealth.appointment.report.open.start</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Appointment Report">
-                    <label name="date"/>
-                    <field name="date"/>
-                    <label name="doctor"/>
-                    <field name="doctor" widget="selection"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">appointments_report_open_start_form</field>
         </record>
         <record model="ir.action.wizard" id="appointments_report_open">
             <field name="name">Appointments Report</field>
@@ -2183,54 +1150,13 @@
         <record model="ir.ui.view" id="gnuhealth_vaccination_form">
             <field name="model">gnuhealth.vaccination</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="vaccination">
-                    <group colspan="4" id="vaccination_header">
-                        <group colspan="4" col="6" id="group_vaccine_dates">
-                            <label name="vaccine"/>
-                            <field name="vaccine"/>
-                            <label name="admin_route"/>
-                            <field name="admin_route"/>
-                            <label name="dose"/>
-                            <field name="dose"/>
-                            <label name="next_dose_date"/>
-                            <field name="next_dose_date"/>
-                        </group>
-                        <newline/>
-                        <label name="date"/>
-                        <field name="date"/>
-                        <label name="institution"/>
-                        <field name="institution"/>
-                        <newline/>
-                        <label name="vaccine_expiration_date"/>
-                        <field name="vaccine_expiration_date"/>
-                        <label name="vaccine_lot"/>
-                        <field name="vaccine_lot"/>
-                    </group>
-                    <newline/>
-                    <separator string="Notes" id="sepatator_vaccination_notes"/>
-                    <newline/>
-                    <field name="observations" colspan="4"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_vaccination_form</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_vaccination_tree">
             <field name="model">gnuhealth.vaccination</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Patient vaccination">
-                    <field name="vaccine" expand="1"/>
-                    <field name="dose" expand="1" />
-                    <field name="date"/>
-                    <field name="next_dose_date"/>
-                    <field name="observations"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_vaccination_tree</field>
         </record>
 
 
@@ -2239,30 +1165,13 @@
         <record model="ir.ui.view" id="gnuhealth_directions_form">
             <field name="model">gnuhealth.directions</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="directions">
-                    <label name="procedure"/>
-                    <field name="procedure"/>
-                    <newline/>
-                    <label name="comments"/>
-                    <field name="comments"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_directions_form</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_directions_tree">
             <field name="model">gnuhealth.directions</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Patient directions">
-                    <field name="procedure" expand="1"/>
-                    <field name="comments" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_directions_tree</field>
         </record>
 
 
@@ -2274,30 +1183,13 @@
         <record model="ir.ui.view" id="gnuhealth_secondary_condition_form">
             <field name="model">gnuhealth.secondary_condition</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Diagnostic Hypothesis">
-                    <label name="pathology"/>
-                    <field name="pathology"/>
-                    <newline/>
-                    <label name="comments"/>
-                    <field name="comments"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_secondary_condition_form</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_secondary_condition_tree">
             <field name="model">gnuhealth.secondary_condition</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Patient Evaluation secondary condition">
-                    <field name="pathology" expand="1"/>
-                    <field name="comments" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_secondary_condition_tree</field>
         </record>
 
 
@@ -2306,30 +1198,13 @@
         <record model="ir.ui.view" id="gnuhealth_diagnostic_hypothesis_form">
             <field name="model">gnuhealth.diagnostic_hypothesis</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Diagnostic Hypothesis">
-                    <label name="pathology"/>
-                    <field name="pathology"/>
-                    <newline/>
-                    <label name="comments"/>
-                    <field name="comments"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_secondary_condition_form</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_diagnostic_hypothesis_tree">
             <field name="model">gnuhealth.diagnostic_hypothesis</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Patient Evaluation other diagnostic hypotheses">
-                    <field name="pathology" expand="1"/>
-                    <field name="comments" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_diagnostic_hypothesis_tree</field>
         </record>
 
 <!-- PATIENT EVALUATION CLINICAL FINDINGS - SIGNS AND SYMPTOMS -->
@@ -2337,40 +1212,13 @@
         <record model="ir.ui.view" id="gnuhealth_signs_and_symptoms_form">
             <field name="model">gnuhealth.signs_and_symptoms</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Clinical Findinds - Signs and Symptoms">
-
-                    <group colspan="4" string="Sign or Symptom" id="group_sign_symptom">
-                        <field name="clinical"/>
-                    </group>
-
-                    <newline/>
-
-                    <label name="sign_or_symptom"/>
-                    <field name="sign_or_symptom"/>
-
-                    <newline/>
-                    <separator string="Comments" id="separator_signs_symptoms" colspan="4"/>
-                    <newline/>
-                    <field name="comments" colspan="4"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_signs_and_symptoms_form</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_signs_and_symptoms_tree">
             <field name="model">gnuhealth.signs_and_symptoms</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Clinical Findinds - Signs and Symptoms">
-                    <field name="sign_or_symptom" expand="1"/>
-                    <field name="clinical" expand="1"/>
-                    <field name="comments" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_signs_and_symptoms_tree</field>
         </record>
 
 <!-- PATIENT DISEASES -->
@@ -2378,89 +1226,13 @@
         <record model="ir.ui.view" id="gnuhealth_patient_diseases_view_form">
             <field name="model">gnuhealth.patient.disease</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Patient Diseases">
-                    <group string="Main" id="group_diseases_main">
-                        <label name="pathology"/>
-                        <field name="pathology"/>
-                        <label name="disease_severity"/>
-                        <field name="disease_severity"/>
-                        <label name="status"/>
-                        <field name="status"/>
-                        <label name="is_infectious"/>
-                        <field name="is_infectious"/>
-                        <label name="is_active"/>
-                        <field name="is_active"/>
-                        <label name="short_comment"/>
-                        <field name="short_comment"/>
-                        <newline/>
-                        <label name="diagnosed_date"/>
-                        <field name="diagnosed_date"/>
-                        <label name="healed_date"/>
-                        <field name="healed_date"/>
-                        <label name="age"/>
-                        <field name="age"/>
-                        <label name="doctor"/>
-                        <field name="doctor"/>
-                    </group>
-                    <newline/>
-                    <group string="Allergies" id="group_patient_allergies">
-                        <label name="is_allergy"/>
-                        <field name="is_allergy"/>
-                        <label name="allergy_type"/>
-                        <field name="allergy_type"/>
-                    </group>
-                    <newline/>
-                    <group string="Pregnancy" id="group_disease_in_pregnancy">
-                        <label name="pregnancy_warning"/>
-                        <field name="pregnancy_warning"/>
-                        <label name="weeks_of_pregnancy"/>
-                        <field name="weeks_of_pregnancy"/>
-                    </group>
-                    <newline/>
-                    <group string="Therapy" id="group_disease_therapy">
-                        <label name="is_on_treatment"/>
-                        <field name="is_on_treatment"/>
-                        <label name="treatment_description"/>
-                        <field name="treatment_description"/>
-                        <label name="date_start_treatment"/>
-                        <field name="date_start_treatment"/>
-                        <label name="date_stop_treatment"/>
-                        <field name="date_stop_treatment"/>
-                        <newline/>
-                        <label name="pcs_code"/>
-                        <field name="pcs_code"/>
-                    </group>
-                    <newline/>
-                    <group string="Extra Info" id="group_disease_extra_info">
-                        <field name="extra_info" colspan="4"/>
-                    </group>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_patient_diseases_form</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_patient_diseases_tree">
             <field name="model">gnuhealth.patient.disease</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Patient diseases"
-                    colors="If(Bool(Eval('is_infectious')),'orange','black')">
-                    <field name="pathology" expand="1"/>
-                    <field name="status" expand="1"/>
-                    <field name="is_active"/>
-                    <field name="is_infectious"/>
-                    <field name="disease_severity"/>
-                    <field name="is_allergy"/>
-                    <field name="pregnancy_warning"/>
-                    <field name="diagnosed_date"/>
-                    <field name="healed_date"/>
-                    <field name="short_comment" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_patient_diseases_tree</field>
         </record>
 
 
@@ -2469,132 +1241,13 @@
         <record model="ir.ui.view" id="gnuhealth_patient_view_form">
             <field name="model">gnuhealth.patient</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="patient">
-<!-- Main Info -->
-                    <group string="Main Info"  id="patient_main_info">
-                        <group colspan="3" id="patient_main_info_name">
-                            <group  colspan="3" col="9" id="patient_main_info_3">
-                                <field colspan="5" name="name"/>
-                                <field name="sex" width="60"/>
-                                <label name="age"/>
-                                <field name="age" width="80"/>
-                                <field name="identification_code" width="80"/>
-                            </group>
-                            <newline/>
-
-                            <group id="critical_info" string="Allergies and Critical Information">
-                                <field height="120" name="critical_info"/>
-                            </group>
-                        </group>
-
-                        <group id="patient__pic">
-                            <field xfill="0" xexpand="1" name="photo" img_width="200" img_height="200"
-                                height="200" width="200" widget="image"/>
-                        </group>
-
-                    </group>
-                        
-
-
-                    <newline/>
-
-                    <notebook>
-                        <page string="General Info" id="general_info">
-                            <notebook>
-
-                                <page string="Main" id="main_info_page">
-                                    <group colspan="4" col="8" id="general_info">
-                                        <label name="primary_care_doctor"/>
-                                        <field name="primary_care_doctor"/>
-                                        <label name="family"/>
-                                        <field name="family"/>
-                                        <field name="marital_status"/>
-                                        <label name="current_insurance"/>
-                                        <field name="current_insurance"/>
-                                    </group>
-
-                                    <newline/>
-
-                                    <group string="Notepad" id="patient_notepad">
-                                        <field height="100" name="general_info" />
-                                    </group>
-                                    
-                                    <newline/>
-
-                                    <group colspan="4" col="8" id="patient_info_2">
-                                        <label name="dob"/>
-                                        <field name="dob"/>
-                                        <label name="ssn"/>
-                                        <field name="ssn"/>
-                                        <label name="blood_type"/>
-                                        <field name="blood_type" width="20"/>
-                                        <field name="rh" width="20"/>
-                                    </group>
-
-                                </page>
-
-                                <page string="Misc" id="misc_info_page">
-                                    <group colspan="4" id="misc_info_group">
-                                        <label name="current_address"/>
-                                        <field name="current_address"/>
-                                        
-                                    </group>
-                                    
-                                    <newline/>
-                                    
-                                    <group colspan="4" col="6" id="misc_info_deceased">
-                                        <label name="deceased"/>
-                                        <field name="deceased"/>
-                                        <label name="dod"/>
-                                        <field name="dod"/>
-                                        <label name="cod"/>
-                                        <field name="cod"/>
-
-                                    </group>
-                                </page>
-
-                            </notebook>
-                        </page>
-
-<!-- Patient Medication and Vaccinations -->
-
-                        <page string="Medication" id="patient_medication">
-                            <field name="medications"/>
-                            <field name="vaccinations"/>
-                        </page>
-
-<!-- Patient Diseases -->
-                        <page string="Diseases" id="patient_diseases">
-                            <field name="diseases" colspan="4"/>
-                        </page>
-
-<!-- Patient Evaluations NOW as a shortcut
-                        <page string="Evaluations" id="patient_evaluations">
-                            <field name="evaluation_ids" colspan="4"/>
-                        </page>
--->
-
-                    </notebook>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_patient_form</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_patient_tree">
             <field name="model">gnuhealth.patient</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="patient">
-                    <field name="name" expand="1"/>
-                    <field name="lastname" expand="1"/>
-                    <field name="ssn" expand="1"/>
-                    <field name="identification_code" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_patient_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="action_gnuhealth_patient_view">
@@ -2623,225 +1276,13 @@
         <record model="ir.ui.view" id="gnuhealth_patient_evaluation_view">
             <field name="model">gnuhealth.patient.evaluation</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Patient Evaluation">
-                    <notebook>
-                        <page string="Main Info" id="page_patient_evaluation_main">
-                            <group colspan="4" col="8" id="evaluation_header"> 
-                                <label name="patient"/>
-                                <field name="patient"/>
-                                <label name="visit_type"/>
-                                <field name="visit_type"/>
-                                <label name="doctor"/>
-                                <field name="doctor"/>
-                                <label name="evaluation_start"/>
-                                <field name="evaluation_start"/>
-                            </group>
-                            <newline/>
-                            <separator colspan="4"
-                                id="separator_chief_complaint"/>
-                            <newline/>
-                            <group col="9" string="Chief Complaint" id="eval_chief_complaint">
-                                <field name="chief_complaint" colspan="5"/>
-                                <label name="information_source"/>
-                                <field name="information_source"/>
-                                <label name="reliable_info"/>
-                                <field name="reliable_info"/>
-                            </group>
-                            <newline/>
-                            <separator string="Present Illness" colspan="4"
-                                id="separator_present_illness"/>
-                            <field name="present_illness" colspan="4"/>
-                            <newline/>
-                            <separator string="Evaluation Summary" colspan="4"
-                                id="separator_evaluation_summary"/>
-                            <newline/>
-                            <field name="evaluation_summary" colspan="4"/>
-                            <newline/>
-                            <group colspan="4" col="12" id="group_eval_misc">
-                                <label name="evaluation_type"/>
-                                <field name="evaluation_type"/>
-                                <label name="specialty"/>
-                                <field name="specialty"/>
-                                <label name="urgency"/>
-                                <field name="urgency"/>
-                                <label name="evaluation_endtime"/>
-                                <field name="evaluation_endtime"/>
-                                <field name="state"/>
-                                <button name="discharge" help="Sign and close the evaluation" 
-                                    string="Sign" icon="tryton-go-next" 
-                                    confirm="Finish and sign this evaluation ? This evaluation will become read-only !"/>
-                                <field name="signed_by"/>
-                            </group>
-                        </page>
-
-                        <page string="Clinical" id="page_patient_evaluation_signs">
-                            <group colspan="4" col="6" string="Vital Signs"
-                                id="group_patient_evaluation_vital_signs">
-                                <label name="temperature"/>
-                                <field name="temperature"/>
-                                <label name="systolic"/>
-                                <field name="systolic"/>
-                                <label name="diastolic"/>
-                                <field name="diastolic"/>
-                                <label name="bpm"/>
-                                <field name="bpm"/>
-                                <label name="respiratory_rate"/>
-                                <field name="respiratory_rate"/>
-                                <label name="osat"/>
-                                <field name="osat"/>
-                            </group>
-                            <newline/>
-                            <group colspan="4" col="6" string="Anthropometry"
-                                id="group_patient_evaluation_anthropometry">
-                                <label name="weight"/>
-                                <field name="weight"/>
-                                <label name="height"/>
-                                <field name="height"/>
-                                <label name="whr"/>
-                                <field name="whr"/>
-                                <label name="abdominal_circ"/>
-                                <field name="abdominal_circ"/>
-                                <label name="hip"/>
-                                <field name="hip"/>
-                                <label name="bmi"/>
-                                <field name="bmi"/>
-                                <label name="head_circumference"/>
-                                <field name="head_circumference"/>
-
-                            </group>
-
-                            <newline/>
-                            <group colspan="4" string="Nutrition"
-                                id="group_patient_evaluation_nutrition">
-                                <label name="malnutrition"/>
-                                <field name="malnutrition"/>
-                                <label name="dehydration"/>
-                                <field name="dehydration"/>
-                            </group>
-                            <newline/>
-
-                            <field name="signs_and_symptoms"/>
-
-                            <newline/>
-
-                            <group colspan="4" col="6" string="Glucose and Lipids Profile"
-                                id="group_patient_evaluation_glucose_lipid">
-                                <label name="glycemia"/>
-                                <field name="glycemia"/>
-                                <label name="hba1c"/>
-                                <field name="hba1c"/>
-                                <label name="cholesterol_total"/>
-                                <field name="cholesterol_total"/>
-                                <label name="hdl"/>
-                                <field name="hdl"/>
-                                <label name="ldl"/>
-                                <field name="ldl"/>
-                                <label name="tag"/>
-                                <field name="tag"/>
-                            </group>
-
-                        </page>
-
-                        <page string="Mental Status" id="page_patient_evaluation_mental">
-                            <group string="Glasgow Coma Scale" colspan="4"
-                                id="group_patient_evaluation_glasgow">
-                                <label name="loc"/>
-                                <field name="loc"/>
-                                <label name="loc_eyes"/>
-                                <field name="loc_eyes"/>
-                                <label name="loc_verbal"/>
-                                <field name="loc_verbal"/>
-                                <label name="loc_motor"/>
-                                <field name="loc_motor"/>
-                            </group>
-                            <newline/>
-                            <group string="Mental Assessment and Impairments"
-                                id="group_patient_evaluation_mental">
-                                <label name="violent"/>
-                                <field name="violent"/>
-                                <label name="mood"/>
-                                <field name="mood"/>
-                                <newline/>
-                                <label name="orientation"/>
-                                <field name="orientation"/>
-                                <label name="memory"/>
-                                <field name="memory"/>
-                                <label name="knowledge_current_events"/>
-                                <field name="knowledge_current_events"/>
-                                <label name="judgment"/>
-                                <field name="judgment"/>
-                                <label name="abstraction"/>
-                                <field name="abstraction"/>
-                                <label name="vocabulary"/>
-                                <field name="vocabulary"/>
-                                <label name="calculation_ability"/>
-                                <field name="calculation_ability"/>
-                                <label name="object_recognition"/>
-                                <field name="object_recognition"/>
-                                <label name="praxis"/>
-                                <field name="praxis"/>
-                            </group>
-                        </page>
-
-                        <page string="Diagnosis" id="page_patient_evaluation_diagnosis">
-                            <label name="diagnosis"/>
-                            <field name="diagnosis" colspan="3"/>
-                            <newline/>
-                            <field name="secondary_conditions" colspan="4" />
-                            <newline/>
-                            <separator string="Information on Diagnosis" colspan="2"
-                                id="separator_evaluation_diagnosis_1"/>
-                            <separator string="Treatment Plan" colspan="2"
-                                id="separator_evaluation_diagnosis_2"/>
-                            <newline/>
-                            <field name="info_diagnosis" colspan="2"/>
-                            <field name="directions" colspan="2"/>
-                            <newline/>
-                            <field name="diagnostic_hypothesis" colspan="2" />
-                            <field name="actions" colspan="2"/>
-                            <newline/>
-                            <label name="evaluation_date"/>
-                            <field name="evaluation_date"/>
-                            <label name="derived_from"/>
-                            <field name="derived_from"/>
-                            <label name="next_evaluation"/>
-                            <field name="next_evaluation"/>
-                            <label name="derived_to"/>
-                            <field name="derived_to"/>
-                        </page>
-
-                    </notebook>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_patient_evaluation</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_patient_evaluation_tree">
             <field name="model">gnuhealth.patient.evaluation</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Evaluations">
-                    <field name="patient" expand="1"/>
-                    <field name="visit_type"/>
-                    <field name="evaluation_type"/>
-                    <field name="urgency"/>
-                    <field name="evaluation_start"/>
-                    <field name="evaluation_length"/>
-                    <field name="specialty"/>
-                    <field name="doctor" expand="1"/>
-                    <field name="state"/>
-                    <field name="urgency"/>
-                    <field name="bmi"/>
-                    <field name="systolic"/>
-                    <field name="diastolic"/>
-                    <field name="diagnosis"/>
-                    <field name="signed_by"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_patient_evaluation_tree</field>
         </record>
 
 <!-- READ-ONLY TREE VIEW We create the patient evaluation from the patient form -->
@@ -2867,96 +1308,13 @@
         <record model="ir.ui.view" id="gnuhealth_prescription_line_view">
             <field name="model">gnuhealth.prescription.line</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Prescription Line">
-                    <label name="medicament"/>
-                    <field name="medicament"/>
-                    <label name="indication"/>
-                    <field name="indication"/>
-                    <label name="allow_substitution"/>
-                    <field name="allow_substitution"/>
-                    <label name="prnt"/>
-                    <field name="prnt"/>
-                    <newline/>
-                    <label name="form"/>
-                    <field name="form"/>
-                    <label name="route"/>
-                    <field name="route"/>
-                    <label name="start_treatment"/>
-                    <field name="start_treatment"/>
-                    <label name="end_treatment"/>
-                    <field name="end_treatment"/>
-                    <newline/>
-                    <group colspan="4" string="Dosage" id="group_dosage">
-                        <group colspan="2" id="group_dose">
-                            <label name="dose"/>
-                            <field name="dose"/>
-                            <label name="dose_unit"/>
-                            <field name="dose_unit"/>
-                        </group>
-                        <label name="qty"/>
-                        <field name="qty"/>
-                        <newline/>
-                        <separator colspan="4" string="Common Dosage"
-                            id="separator_common_dosage"/>
-                        <newline/>
-                        <label name="common_dosage"/>
-                        <field name="common_dosage"/>
-                        <label name="admin_times"/>
-                        <field name="admin_times"/>
-                        <newline/>
-                        <separator colspan="4" string="Specific Dosage"
-                            id="separator_specific_dosage"/>
-                        <newline/>
-                        <group col="6" colspan="4" id="specific_dose">
-                            <label name="frequency"/>
-                            <field name="frequency"/>
-                            <label name="frequency_unit"/>
-                            <field name="frequency_unit"/>
-                            <label name="frequency_prn"/>
-                            <field name="frequency_prn"/>
-                        </group>
-                    </group>
-                    <newline/>
-                    <label name="duration"/>
-                    <field name="duration"/>
-                    <label name="duration_period"/>
-                    <field name="duration_period"/>
-                    <label name="review"/>
-                    <field name="review"/>
-                    <label name="quantity"/>
-                    <field name="quantity"/>
-                    <label name="refills"/>
-                    <field name="refills"/>
-                    <label name="short_comment"/>
-                    <field name="short_comment"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_prescription_line</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_prescription_line_tree">
             <field name="model">gnuhealth.prescription.line</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Prescription lines">
-                    <field name="prnt" expand="1"/>
-                    <field name="medicament" expand="1"/>
-                    <field name="indication" expand="1"/>
-                    <field name="dose"/>
-                    <field name="dose_unit"/>
-                    <field name="form"/>
-                    <field name="common_dosage"/>
-                    <field name="quantity"/>
-                    <field name="duration"/>
-                    <field name="duration_period"/>
-                    <field name="allow_substitution"/>
-                    <field name="short_comment" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_prescription_line_tree</field>
         </record>
 
 
@@ -2965,52 +1323,13 @@
         <record model="ir.ui.view" id="gnuhealth_prescription_view">
             <field name="model">gnuhealth.prescription.order</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Prescription">
-                    <group string="Patient and Doctor Information"
-                        id="prescription_patient_info">
-                        <label name="patient"/>
-                        <field name="patient"/>
-                        <label name="prescription_id"/>
-                        <field name="prescription_id"/>
-                        <label name="prescription_date"/>
-                        <field name="prescription_date"/>
-                        <label name="doctor"/>
-                        <field name="doctor"/>
-                        <label name="pharmacy"/>
-                        <field name="pharmacy"/>
-                        <group colspan="2" id="prescription_warning">
-                            <label name="pregnancy_warning"/>
-                            <field name="pregnancy_warning"/>
-                            <label name="prescription_warning_ack"/>
-                            <field name="prescription_warning_ack"/>
-                        </group>
-                    </group>
-                    <newline/>
-                    <field name="prescription_line" colspan="4"/>
-                    <newline/>
-                    <group string="Notes" id="group_prescription_notes">
-                        <field name="notes" colspan="4"/>
-                    </group>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_prescription</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_prescription_tree">
             <field name="model">gnuhealth.prescription.order</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Prescription">
-                    <field name="prescription_id" expand="1"/>
-                    <field name="patient" expand="1"/>
-                    <field name="doctor"/>
-                    <field name="prescription_date" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_prescription_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="action_gnuhealth_prescription_view">
@@ -3063,33 +1382,13 @@
         <record model="ir.ui.view" id="gnuhealth_hospital_building_view">
             <field name="model">gnuhealth.hospital.building</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Building">
-                    <label name="name"/>
-                    <field name="name"/>
-                    <label name="institution"/>
-                    <field name="institution"/>
-                    <label name="code"/>
-                    <field name="code"/>
-                    <newline/>
-                    <field name="extra_info" colspan="4"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_hospital_building</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_hospital_building_tree">
             <field name="model">gnuhealth.hospital.building</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Health Center Building">
-                    <field name="name" expand="1"/>
-                    <field name="institution" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_hospital_building_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="action_gnuhealth_hospital_building_view">
@@ -3118,33 +1417,13 @@
         <record model="ir.ui.view" id="gnuhealth_hospital_unit_view">
             <field name="model">gnuhealth.hospital.unit</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="unit">
-                    <label name="name"/>
-                    <field name="name"/>
-                    <label name="institution"/>
-                    <field name="institution"/>
-                    <label name="code"/>
-                    <field name="code"/>
-                    <newline/>
-                    <field name="extra_info" colspan="4"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_hospital_unit</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_hospital_unit_tree">
             <field name="model">gnuhealth.hospital.unit</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Health Center unit">
-                    <field name="name" expand="1"/>
-                    <field name="institution" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_hospital_unit_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="action_gnuhealth_hospital_unit_view">
@@ -3173,70 +1452,13 @@
         <record model="ir.ui.view" id="gnuhealth_hospital_ward_view">
             <field name="model">gnuhealth.hospital.ward</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Health Center Ward">
-                    <label name="name"/>
-                    <field name="name"/>
-                    <label name="institution"/>
-                    <field name="institution"/>
-                    <label name="building"/>
-                    <field name="building"/>
-                    <label name="floor"/>
-                    <field name="floor"/>
-                    <label name="private"/>
-                    <field name="private"/>
-                    <label name="unit"/>
-                    <field name="unit"/>
-                    <label name="bio_hazard"/>
-                    <field name="bio_hazard"/>
-                    <newline/>
-                    <group colspan="4" id="group_ward1">
-                        <label name="number_of_beds"/>
-                        <field name="number_of_beds"/>
-                        <label name="gender"/>
-                        <field name="gender"/>
-                        <label name="telephone"/>
-                        <field name="telephone"/>
-                        <label name="ac"/>
-                        <field name="ac"/>
-                        <label name="private_bathroom"/>
-                        <field name="private_bathroom"/>
-                        <label name="guest_sofa"/>
-                        <field name="guest_sofa"/>
-                        <label name="tv"/>
-                        <field name="tv"/>
-                        <label name="internet"/>
-                        <field name="internet"/>
-                        <label name="refrigerator"/>
-                        <field name="refrigerator"/>
-                        <label name="microwave"/>
-                        <field name="microwave"/>
-                        <label name="state"/>
-                        <field name="state"/>
-                    </group>
-                    <newline/>
-                    <label name="extra_info"/>
-                    <field name="extra_info" colspan="4"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_hospital_ward</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_hospital_ward_tree">
             <field name="model">gnuhealth.hospital.ward</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Health Center Ward Info">
-                    <field name="name" expand="1"/>
-                    <field name="number_of_beds" expand="1"/>
-                    <field name="gender" expand="1"/>
-                    <field name="institution" expand="1"/>
-                    <field name="state" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_hospital_ward_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="action_gnuhealth_hospital_ward_view">
@@ -3265,41 +1487,13 @@
         <record model="ir.ui.view" id="gnuhealth_hospital_bed_view">
             <field name="model">gnuhealth.hospital.bed</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Bed">
-                    <label name="name"/>
-                    <field name="name"/>
-                    <label name="ward"/>
-                    <field name="ward"/>
-                    <label name="bed_type"/>
-                    <field name="bed_type"/>
-                    <label name="telephone_number"/>
-                    <field name="telephone_number"/>
-                    <label name="state"/>
-                    <field name="state"/>
-                    <newline/>
-                    <group colspan="4" id="group_bed_extra_info">
-                        <label name="extra_info"/>
-                        <field name="extra_info"/>
-                    </group>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_hospital_bed</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_hospital_bed_tree">
             <field name="model">gnuhealth.hospital.bed</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Health Center Bed Info">
-                    <field name="name" expand="1"/>
-                    <field name="ward" expand="1"/>
-                    <field name="state" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_hospital_bed_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="action_gnuhealth_hospital_bed_view">
@@ -3328,38 +1522,13 @@
         <record model="ir.ui.view" id="gnuhealth_hospital_or_view">
             <field name="model">gnuhealth.hospital.or</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Operating Room">
-                    <label name="name"/>
-                    <field name="name"/>
-                    <label name="institution"/>
-                    <field name="institution"/>
-                    <label name="building"/>
-                    <field name="building"/>
-                    <label name="unit"/>
-                    <field name="unit"/>
-                    <newline/>
-                    <label name="extra_info"/>
-                    <field name="extra_info" colspan="4"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_hospital_or</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_hospital_or_tree">
             <field name="model">gnuhealth.hospital.or</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Operating Room">
-                    <field name="name"/>
-                    <field name="institution"/>
-                    <field name="building"/>
-                    <field name="unit" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_hospital_or_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="action_gnuhealth_hospital_or_view">
--- a/tryton/health/setup.py
+++ b/tryton/health/setup.py
@@ -62,7 +62,8 @@
     package_data={
         'trytond.modules.health': info.get('xml', []) \
             + info.get('translation', []) \
-            + ['tryton.cfg', 'doc/*.rst', 'locale/*.po', 'report/*.odt', 'icons/*.svg'],
+            + ['tryton.cfg', 'view/*.xml', 'doc/*.rst', 'locale/*.po',
+               'report/*.odt', 'icons/*.svg'],
         },
 
     classifiers=[
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/address_tree.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<data>
+    <xpath expr="/tree/field[@name=&quot;active&quot;]" position="after">
+        <field name="is_school"/>
+        <field name="is_work"/>
+    </xpath>
+</data>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/appointments_report_open_start_form.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<form string="Appointment Report">
+    <label name="date"/>
+    <field name="date"/>
+    <label name="doctor"/>
+    <field name="doctor" widget="selection"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/appointments_report_tree.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<tree string="Appointments Report" keyword_open="1">
+    <field name="identification_code"/>
+    <field name="ref"/>
+    <field name="patient"/>
+    <field name="age"/>
+    <field name="sex"/>
+    <field name="address"/>
+    <field name="insurance"/>
+    <field name="diagnosis"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_alternative_identification_form.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<form string="Person alternative IDs">
+    <label name="code"/>
+    <field name="code"/>
+    <label name="alternative_id_type"/>
+    <field name="alternative_id_type"/>
+    <label name="comments"/>
+    <field name="comments"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_alternative_identification_tree.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<tree editable="top" string="Alternative ID">
+    <field name="code" expand="1"/>
+    <field name="alternative_id_type" expand="1"/>
+    <field name="comments" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_appointment_form.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<form string="Appointment">
+    <group colspan="4" col="6" id="appointment_header">
+        <label name="name"/>
+        <field name="name"/>
+        <label name="institution"/>
+        <field name="institution"/>
+        <label name="patient"/>
+        <field name="patient"/>
+        <label name="appointment_date"/>
+        <field name="appointment_date"/>
+        <label name="visit_type"/>
+        <field name="visit_type"/>
+        <label name="urgency"/>
+        <field name="urgency"/>
+        <label name="appointment_type"/>
+        <field name="appointment_type"/>
+        <label name="state"/>
+        <field name="state"/>
+    </group>
+    <newline/>
+    <group colspan="4" id="doc_appointment_header">
+        <label name="doctor"/>
+        <field name="doctor"/>
+        <label name="speciality"/>
+        <field name="speciality"/>
+    </group>
+    <separator string="Information" id="sepatator_appointment_notes"/>
+    <newline/>
+    <field name="comments" colspan="4"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_appointment_tree.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<tree string="Patient appointment">
+    <field name="name" expand="1"/>
+    <field name="patient" expand="1"/>
+    <field name="appointment_type" expand="1"/>
+    <field name="urgency" expand="1"/>
+    <field name="appointment_date"/>
+    <field name="speciality"/>
+    <field name="doctor"/>
+    <field name="institution" expand="1"/>
+    <field name="state"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_diagnostic_hypothesis_form.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<form string="Diagnostic Hypothesis">
+    <label name="pathology"/>
+    <field name="pathology"/>
+    <newline/>
+    <label name="comments"/>
+    <field name="comments"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_diagnostic_hypothesis_tree.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<tree string="Patient Evaluation other diagnostic hypotheses">
+    <field name="pathology" expand="1"/>
+    <field name="comments" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_directions_form.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<form string="directions">
+    <label name="procedure"/>
+    <field name="procedure"/>
+    <newline/>
+    <label name="comments"/>
+    <field name="comments"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_directions_tree.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<tree string="Patient directions">
+    <field name="procedure" expand="1"/>
+    <field name="comments" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_disease_group_members.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<form string="Pathology Group Member">
+    <label name="disease_group"/>
+    <field name="disease_group"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_disease_group_members_tree.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<tree string="Member of Pathology Groups">
+    <field name="disease_group" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_dosage.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<form string="Dosage">
+    <group id="dosage_header">
+        <label name="name"/>
+        <field name="name"/>
+        <label name="code"/>
+        <field name="code"/>
+        <label name="abbreviation"/>
+        <field name="abbreviation"/>
+    </group>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_dosage_tree.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<tree string="Dosages">
+    <field name="name" expand="1"/>
+    <field name="code" expand="1"/>
+    <field name="abbreviation" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_dose.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<form string="dose">
+    <group id="dose_header">
+        <label name="name"/>
+        <field name="name"/>
+        <label name="desc"/>
+        <field name="desc"/>
+    </group>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_dose_tree.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<tree string="doses">
+    <field name="name" expand="1"/>
+    <field name="desc" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_drug_form.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<form string="Drug Form">
+    <group id="drug_form_header">
+        <label name="name"/>
+        <field name="name"/>
+        <label name="code"/>
+        <field name="code"/>
+    </group>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_drug_form_tree.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<tree string="Drug Forms">
+    <field name="name" expand="1"/>
+    <field name="code" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_drug_route.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<form string="Drug Form">
+    <group id="drug_route_header">
+        <label name="name"/>
+        <field name="name"/>
+        <label name="code"/>
+        <field name="code"/>
+    </group>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_drug_route_tree.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<tree string="Drug Forms">
+    <field name="name" expand="1"/>
+    <field name="code" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_du.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0"?>
+<form string="Domicilary Unit">
+    <group id="du_header">
+        <group col="6" id="du_address">
+            <label name="name"/>
+            <field name="name"/>
+            <label name="desc"/>
+            <field colspan="3" name="desc"/>
+            <newline/>
+            <label name="address_street"/>
+            <field name="address_street"/>
+            <label name="address_street_number"/>
+            <field name="address_street_number"/>
+            <label name="address_street_bis"/>
+            <field name="address_street_bis"/>
+            <label name="address_district"/>
+            <field name="address_district"/>
+            <label name="address_municipality"/>
+            <field name="address_municipality"/>
+            <label name="address_city"/>
+            <field name="address_city"/>
+            <label name="address_zip"/>
+            <field name="address_zip"/>
+            <label name="address_country"/>
+            <field name="address_country"/>
+            <label name="address_subdivision"/>
+            <field name="address_subdivision"/>
+        </group>
+        <group id="du_picture">
+            <field xfill="0" xexpand="1" name="picture" img_width="200" img_height="200" height="200" width="200" widget="image"/>
+        </group>
+        <newline/>
+        <group col="6" colspan="4" id="du_georef">
+            <label name="latitude"/>
+            <field name="latitude"/>
+            <label name="longitude"/>
+            <field name="longitude"/>
+            <label name="urladdr"/>
+            <field name="urladdr" widget="url"/>
+        </group>
+        <newline/>
+        <group colspan="4" col="6" id="du_living_conditions">
+            <label name="housing"/>
+            <field name="housing"/>
+            <label name="dwelling"/>
+            <field name="dwelling"/>
+        </group>
+        <newline/>
+        <group colspan="4" col="8" id="infrastructure" string="Infrastructure">
+            <label name="materials"/>
+            <field name="materials"/>
+            <label name="roof_type"/>
+            <field name="roof_type"/>
+            <label name="total_surface"/>
+            <field name="total_surface"/>
+            <label name="bedrooms"/>
+            <field name="bedrooms"/>
+            <label name="bathrooms"/>
+            <field name="bathrooms"/>
+            <label name="water"/>
+            <field name="water"/>
+            <label name="sewers"/>
+            <field name="sewers"/>
+            <label name="electricity"/>
+            <field name="electricity"/>
+            <label name="gas"/>
+            <field name="gas"/>
+            <label name="telephone"/>
+            <field name="telephone"/>
+            <label name="internet"/>
+            <field name="internet"/>
+            <label name="television"/>
+            <field name="television"/>
+        </group>
+        <label name="operational_sector"/>
+        <field name="operational_sector"/>
+    </group>
+    <newline/>
+    <field name="members"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_du_tree.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<tree string="Domiciliary Units">
+    <field name="name" expand="1"/>
+    <field name="desc" expand="1"/>
+    <field name="address_city" expand="1"/>
+    <field name="address_country" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_ethnicity.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<form string="ethnicity">
+    <group id="ethnicity_header">
+        <label name="name"/>
+        <field name="name"/>
+        <label name="code"/>
+        <field name="code"/>
+        <label name="notes"/>
+        <field name="notes"/>
+    </group>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_ethnicity_tree.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<tree string="Ethnicities">
+    <field name="name" expand="1"/>
+    <field name="code" expand="1"/>
+    <field name="notes" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_family.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<form string="Family">
+    <group id="family_header">
+        <label name="name"/>
+        <field name="name"/>
+    </group>
+    <newline/>
+    <separator string="Members" id="members"/>
+    <newline/>
+    <field name="members"/>
+    <newline/>
+    <separator string="Extra Info" id="extra_info"/>
+    <newline/>
+    <field name="info"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_family_member.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<form string="Family Member">
+    <label name="party"/>
+    <field name="party"/>
+    <label name="role"/>
+    <field name="role"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_family_member_tree.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<tree string="Family Members">
+    <field name="name" expand="1"/>
+    <field name="party" expand="1"/>
+    <field name="role" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_family_tree.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<tree string="Families">
+    <field name="name" expand="1"/>
+    <field name="info" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_hospital_bed.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<form string="Bed">
+    <label name="name"/>
+    <field name="name"/>
+    <label name="ward"/>
+    <field name="ward"/>
+    <label name="bed_type"/>
+    <field name="bed_type"/>
+    <label name="telephone_number"/>
+    <field name="telephone_number"/>
+    <label name="state"/>
+    <field name="state"/>
+    <newline/>
+    <group colspan="4" id="group_bed_extra_info">
+        <label name="extra_info"/>
+        <field name="extra_info"/>
+    </group>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_hospital_bed_tree.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<tree string="Health Center Bed Info">
+    <field name="name" expand="1"/>
+    <field name="ward" expand="1"/>
+    <field name="state" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_hospital_building.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<form string="Building">
+    <label name="name"/>
+    <field name="name"/>
+    <label name="institution"/>
+    <field name="institution"/>
+    <label name="code"/>
+    <field name="code"/>
+    <newline/>
+    <field name="extra_info" colspan="4"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_hospital_building_tree.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<tree string="Health Center Building">
+    <field name="name" expand="1"/>
+    <field name="institution" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_hospital_or.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<form string="Operating Room">
+    <label name="name"/>
+    <field name="name"/>
+    <label name="institution"/>
+    <field name="institution"/>
+    <label name="building"/>
+    <field name="building"/>
+    <label name="unit"/>
+    <field name="unit"/>
+    <newline/>
+    <label name="extra_info"/>
+    <field name="extra_info" colspan="4"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_hospital_or_tree.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<tree string="Operating Room">
+    <field name="name"/>
+    <field name="institution"/>
+    <field name="building"/>
+    <field name="unit" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_hospital_unit.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<form string="unit">
+    <label name="name"/>
+    <field name="name"/>
+    <label name="institution"/>
+    <field name="institution"/>
+    <label name="code"/>
+    <field name="code"/>
+    <newline/>
+    <field name="extra_info" colspan="4"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_hospital_unit_tree.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<tree string="Health Center unit">
+    <field name="name" expand="1"/>
+    <field name="institution" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_hospital_ward.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<form string="Health Center Ward">
+    <label name="name"/>
+    <field name="name"/>
+    <label name="institution"/>
+    <field name="institution"/>
+    <label name="building"/>
+    <field name="building"/>
+    <label name="floor"/>
+    <field name="floor"/>
+    <label name="private"/>
+    <field name="private"/>
+    <label name="unit"/>
+    <field name="unit"/>
+    <label name="bio_hazard"/>
+    <field name="bio_hazard"/>
+    <newline/>
+    <group colspan="4" id="group_ward1">
+        <label name="number_of_beds"/>
+        <field name="number_of_beds"/>
+        <label name="gender"/>
+        <field name="gender"/>
+        <label name="telephone"/>
+        <field name="telephone"/>
+        <label name="ac"/>
+        <field name="ac"/>
+        <label name="private_bathroom"/>
+        <field name="private_bathroom"/>
+        <label name="guest_sofa"/>
+        <field name="guest_sofa"/>
+        <label name="tv"/>
+        <field name="tv"/>
+        <label name="internet"/>
+        <field name="internet"/>
+        <label name="refrigerator"/>
+        <field name="refrigerator"/>
+        <label name="microwave"/>
+        <field name="microwave"/>
+        <label name="state"/>
+        <field name="state"/>
+    </group>
+    <newline/>
+    <label name="extra_info"/>
+    <field name="extra_info" colspan="4"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_hospital_ward_tree.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<tree string="Health Center Ward Info">
+    <field name="name" expand="1"/>
+    <field name="number_of_beds" expand="1"/>
+    <field name="gender" expand="1"/>
+    <field name="institution" expand="1"/>
+    <field name="state" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_hp_specialty.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<form string="Health Professional Specialties">
+    <label name="name"/>
+    <field name="name"/>
+    <label name="specialty"/>
+    <field name="specialty"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_hp_specialty_tree.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<tree string="Health Professional Specialties">
+    <field name="specialty"/>
+    <field name="name"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_insurance_form.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<form string="Insurances">
+    <group col="6" colspan="4" id="insurance_header">
+        <label name="number"/>
+        <field name="number"/>
+        <label name="name"/>
+        <field name="name"/>
+        <label name="insurance_type"/>
+        <field name="insurance_type" widget="selection"/>
+    </group>
+    <newline/>
+    <group col="6" colspan="4" id="insurance_plan">
+        <label name="company"/>
+        <field name="company"/>
+        <label name="plan_id"/>
+        <field name="plan_id"/>
+        <label name="category"/>
+        <field name="category"/>
+    </group>
+    <newline/>
+    <label name="member_since"/>
+    <field name="member_since"/>
+    <label name="member_exp"/>
+    <field name="member_exp"/>
+    <newline/>
+    <field name="notes" colspan="4"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_insurance_plan.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<form string="Insurance Plans">
+    <label name="name"/>
+    <field name="name"/>
+    <newline/>
+    <label name="company"/>
+    <field name="company"/>
+    <label name="is_default"/>
+    <field name="is_default"/>
+    <newline/>
+    <field name="notes" colspan="4"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_insurance_plan_tree.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<tree string="Insurance Plans">
+    <field name="name" expand="1"/>
+    <field name="is_default" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_insurance_tree.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<tree string="Insurance List">
+    <field name="number" expand="1"/>
+    <field name="name" expand="1"/>
+    <field name="plan_id"/>
+    <field name="insurance_type"/>
+    <field name="company"/>
+    <field name="category"/>
+    <field name="member_since"/>
+    <field name="member_exp" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_medicament_category_form.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<form string="Medicament categories">
+    <field name="name"/>
+    <field name="parent"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_medicament_category_list.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<tree string="Medicament Categories">
+    <field name="name" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_medicament_category_tree.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<tree string="Medicament Categories" keyword_open="1">
+    <field name="name" expand="1"/>
+    <field name="parent" tree_invisible="1"/>
+    <field name="childs" tree_invisible="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_medicament_form.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0"?>
+<form string="medicaments">
+    <label name="name"/>
+    <field name="name"/>
+    <label name="category"/>
+    <field name="category"/>
+    <newline/>
+    <!--
+    <label name="therapeutic_action"/>
+    <field name="therapeutic_action"/>
+    -->
+    <label name="active_component"/>
+    <field name="active_component"/>
+    <newline/>
+    <notebook>
+        <page string="Main Info" id="medicament_main">
+            <separator string="Indications" colspan="4" id="separator_medication_indication"/>
+            <newline/>
+            <field name="indications" colspan="4"/>
+        </page>
+        <page string="Presentation" id="medicament_presentation">
+            <label name="presentation"/>
+            <field name="presentation"/>
+        </page>
+        <page string="Composition" id="medicament_composition">
+            <label name="composition"/>
+            <field name="composition"/>
+        </page>
+        <page string="Dosage" id="medicament_dosage">
+            <label name="dosage"/>
+            <field name="dosage"/>
+            <newline/>
+            <label name="overdosage"/>
+            <field name="overdosage"/>
+        </page>
+        <page string="Pregnancy" id="medicament_pregnancy">
+            <label name="pregnancy_warning"/>
+            <field name="pregnancy_warning"/>
+            <label name="pregnancy_category"/>
+            <field name="pregnancy_category"/>
+            <newline/>
+            <separator string="Notes" id="pregnancy_notes" colspan="4"/>
+            <newline/>
+            <field colspan="4" name="pregnancy"/>
+        </page>
+        <page string="Adverse Reactions" id="medicament_adverse_reactions">
+            <label name="adverse_reaction"/>
+            <field name="adverse_reaction"/>
+        </page>
+        <page string="Storage" id="medicament_storage">
+            <label name="storage"/>
+            <field name="storage"/>
+        </page>
+        <page string="Extra Info" id="medicament_extra_info">
+            <label name="notes"/>
+            <field name="notes"/>
+        </page>
+    </notebook>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_medicament_tree.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<tree string="medicament" colors="If(Equal(Eval('pregnancy_category'), 'X'), 'red', If(Equal(Eval('pregnancy_category'), 'D'), 'brown', If(Equal(Eval('pregnancy_category'), 'C'), 'orange', If(Equal(Eval('pregnancy_category'), 'N'), 'black', 'blue'))))">
+    <field name="name" expand="1"/>
+    <field name="active_component" expand="1"/>
+    <field name="category"/>
+    <field name="pregnancy_warning" expand="1"/>
+    <field name="pregnancy_category" expand="1"/>
+    <field name="adverse_reaction" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_occupation.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<form string="occupation">
+    <group id="occupation_header">
+        <label name="name"/>
+        <field name="name"/>
+        <label name="code"/>
+        <field name="code"/>
+    </group>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_occupation_tree.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<tree string="Occupations">
+    <field name="name" expand="1"/>
+    <field name="code" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_operational_area.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<form string="Operational Area">
+    <label name="name"/>
+    <field name="name"/>
+    <newline/>
+    <field name="operational_sector" colspan="4"/>
+    <field name="info" colspan="4"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_operational_area_tree.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<tree string="Operational Areas List">
+    <field name="name" expand="1"/>
+    <field name="info" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_operational_sector.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<form string="Region Operational Sector">
+    <label name="name"/>
+    <field name="name"/>
+    <newline/>
+    <label name="operational_area"/>
+    <field name="operational_area"/>
+    <newline/>
+    <label name="info"/>
+    <field name="info" colspan="4"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_operational_sector_tree.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<tree string="Operational Sector List">
+    <field name="name" expand="1"/>
+    <field name="operational_area" expand="1"/>
+    <field name="info" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_pathology.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<form string="Pathology Info">
+    <notebook>
+        <page string="Main" id="disease_main">
+            <group colspan="4" col="6" id="pathology_header">
+                <label name="name"/>
+                <field name="name"/>
+                <label name="code"/>
+                <field name="code"/>
+                <label name="category"/>
+                <field name="category"/>
+            </group>
+            <newline/>
+            <field name="groups"/>
+        </page>
+        <page string="Genetics" id="disease_genetics">
+            <label name="chromosome"/>
+            <field name="chromosome"/>
+            <label name="protein"/>
+            <field name="protein"/>
+            <label name="gene"/>
+            <field name="gene"/>
+        </page>
+        <page string="Extra Info" id="disease_extra_info">
+            <field name="info"/>
+        </page>
+    </notebook>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_pathology_category_form.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<form string="Disease categories">
+    <field name="name"/>
+    <field name="parent"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_pathology_category_list.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<tree string="Disease Categories">
+    <field name="name" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_pathology_category_tree.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<tree string="Disease Categories" keyword_open="1">
+    <field name="name" expand="1"/>
+    <field name="parent" tree_invisible="1"/>
+    <field name="childs" tree_invisible="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_pathology_group_form.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<form string="Pathology Groups">
+    <group id="pathology_group_header">
+        <label name="name"/>
+        <field name="name"/>
+        <newline/>
+        <label name="code"/>
+        <field name="code"/>
+        <label name="desc"/>
+        <field name="desc"/>
+        <newline/>
+    </group>
+    <separator string="Extra Information" colspan="4" id="pathology_groups_info"/>
+    <group id="pathology_groups">
+        <newline/>
+        <field name="info" colspan="4"/>
+    </group>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_pathology_group_tree.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<tree string="Pathology Groups">
+    <field name="name" expand="1"/>
+    <field name="code" expand="1"/>
+    <field name="desc" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_pathology_tree.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<tree string="Pathology">
+    <field name="name" expand="1"/>
+    <field name="code" expand="1"/>
+    <field name="category" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_patient_diseases_form.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<form string="Patient Diseases">
+    <group string="Main" id="group_diseases_main">
+        <label name="pathology"/>
+        <field name="pathology"/>
+        <label name="disease_severity"/>
+        <field name="disease_severity"/>
+        <label name="status"/>
+        <field name="status"/>
+        <label name="is_infectious"/>
+        <field name="is_infectious"/>
+        <label name="is_active"/>
+        <field name="is_active"/>
+        <label name="short_comment"/>
+        <field name="short_comment"/>
+        <newline/>
+        <label name="diagnosed_date"/>
+        <field name="diagnosed_date"/>
+        <label name="healed_date"/>
+        <field name="healed_date"/>
+        <label name="age"/>
+        <field name="age"/>
+        <label name="doctor"/>
+        <field name="doctor"/>
+    </group>
+    <newline/>
+    <group string="Allergies" id="group_patient_allergies">
+        <label name="is_allergy"/>
+        <field name="is_allergy"/>
+        <label name="allergy_type"/>
+        <field name="allergy_type"/>
+    </group>
+    <newline/>
+    <group string="Pregnancy" id="group_disease_in_pregnancy">
+        <label name="pregnancy_warning"/>
+        <field name="pregnancy_warning"/>
+        <label name="weeks_of_pregnancy"/>
+        <field name="weeks_of_pregnancy"/>
+    </group>
+    <newline/>
+    <group string="Therapy" id="group_disease_therapy">
+        <label name="is_on_treatment"/>
+        <field name="is_on_treatment"/>
+        <label name="treatment_description"/>
+        <field name="treatment_description"/>
+        <label name="date_start_treatment"/>
+        <field name="date_start_treatment"/>
+        <label name="date_stop_treatment"/>
+        <field name="date_stop_treatment"/>
+        <newline/>
+        <label name="pcs_code"/>
+        <field name="pcs_code"/>
+    </group>
+    <newline/>
+    <group string="Extra Info" id="group_disease_extra_info">
+        <field name="extra_info" colspan="4"/>
+    </group>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_patient_diseases_tree.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<tree string="Patient diseases" colors="If(Bool(Eval('is_infectious')),'orange','black')">
+    <field name="pathology" expand="1"/>
+    <field name="status" expand="1"/>
+    <field name="is_active"/>
+    <field name="is_infectious"/>
+    <field name="disease_severity"/>
+    <field name="is_allergy"/>
+    <field name="pregnancy_warning"/>
+    <field name="diagnosed_date"/>
+    <field name="healed_date"/>
+    <field name="short_comment" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_patient_evaluation.xml
@@ -0,0 +1,167 @@
+<?xml version="1.0"?>
+<form string="Patient Evaluation">
+    <notebook>
+        <page string="Main Info" id="page_patient_evaluation_main">
+            <group colspan="4" col="8" id="evaluation_header">
+                <label name="patient"/>
+                <field name="patient"/>
+                <label name="visit_type"/>
+                <field name="visit_type"/>
+                <label name="doctor"/>
+                <field name="doctor"/>
+                <label name="evaluation_start"/>
+                <field name="evaluation_start"/>
+            </group>
+            <newline/>
+            <separator colspan="4" id="separator_chief_complaint"/>
+            <newline/>
+            <group col="9" string="Chief Complaint" id="eval_chief_complaint">
+                <field name="chief_complaint" colspan="5"/>
+                <label name="information_source"/>
+                <field name="information_source"/>
+                <label name="reliable_info"/>
+                <field name="reliable_info"/>
+            </group>
+            <newline/>
+            <separator string="Present Illness" colspan="4" id="separator_present_illness"/>
+            <field name="present_illness" colspan="4"/>
+            <newline/>
+            <separator string="Evaluation Summary" colspan="4" id="separator_evaluation_summary"/>
+            <newline/>
+            <field name="evaluation_summary" colspan="4"/>
+            <newline/>
+            <group colspan="4" col="12" id="group_eval_misc">
+                <label name="evaluation_type"/>
+                <field name="evaluation_type"/>
+                <label name="specialty"/>
+                <field name="specialty"/>
+                <label name="urgency"/>
+                <field name="urgency"/>
+                <label name="evaluation_endtime"/>
+                <field name="evaluation_endtime"/>
+                <field name="state"/>
+                <button name="discharge" help="Sign and close the evaluation" string="Sign" icon="tryton-go-next" confirm="Finish and sign this evaluation ? This evaluation will become read-only !"/>
+                <field name="signed_by"/>
+            </group>
+        </page>
+        <page string="Clinical" id="page_patient_evaluation_signs">
+            <group colspan="4" col="6" string="Vital Signs" id="group_patient_evaluation_vital_signs">
+                <label name="temperature"/>
+                <field name="temperature"/>
+                <label name="systolic"/>
+                <field name="systolic"/>
+                <label name="diastolic"/>
+                <field name="diastolic"/>
+                <label name="bpm"/>
+                <field name="bpm"/>
+                <label name="respiratory_rate"/>
+                <field name="respiratory_rate"/>
+                <label name="osat"/>
+                <field name="osat"/>
+            </group>
+            <newline/>
+            <group colspan="4" col="6" string="Anthropometry" id="group_patient_evaluation_anthropometry">
+                <label name="weight"/>
+                <field name="weight"/>
+                <label name="height"/>
+                <field name="height"/>
+                <label name="whr"/>
+                <field name="whr"/>
+                <label name="abdominal_circ"/>
+                <field name="abdominal_circ"/>
+                <label name="hip"/>
+                <field name="hip"/>
+                <label name="bmi"/>
+                <field name="bmi"/>
+                <label name="head_circumference"/>
+                <field name="head_circumference"/>
+            </group>
+            <newline/>
+            <group colspan="4" string="Nutrition" id="group_patient_evaluation_nutrition">
+                <label name="malnutrition"/>
+                <field name="malnutrition"/>
+                <label name="dehydration"/>
+                <field name="dehydration"/>
+            </group>
+            <newline/>
+            <field name="signs_and_symptoms"/>
+            <newline/>
+            <group colspan="4" col="6" string="Glucose and Lipids Profile" id="group_patient_evaluation_glucose_lipid">
+                <label name="glycemia"/>
+                <field name="glycemia"/>
+                <label name="hba1c"/>
+                <field name="hba1c"/>
+                <label name="cholesterol_total"/>
+                <field name="cholesterol_total"/>
+                <label name="hdl"/>
+                <field name="hdl"/>
+                <label name="ldl"/>
+                <field name="ldl"/>
+                <label name="tag"/>
+                <field name="tag"/>
+            </group>
+        </page>
+        <page string="Mental Status" id="page_patient_evaluation_mental">
+            <group string="Glasgow Coma Scale" colspan="4" id="group_patient_evaluation_glasgow">
+                <label name="loc"/>
+                <field name="loc"/>
+                <label name="loc_eyes"/>
+                <field name="loc_eyes"/>
+                <label name="loc_verbal"/>
+                <field name="loc_verbal"/>
+                <label name="loc_motor"/>
+                <field name="loc_motor"/>
+            </group>
+            <newline/>
+            <group string="Mental Assessment and Impairments" id="group_patient_evaluation_mental">
+                <label name="violent"/>
+                <field name="violent"/>
+                <label name="mood"/>
+                <field name="mood"/>
+                <newline/>
+                <label name="orientation"/>
+                <field name="orientation"/>
+                <label name="memory"/>
+                <field name="memory"/>
+                <label name="knowledge_current_events"/>
+                <field name="knowledge_current_events"/>
+                <label name="judgment"/>
+                <field name="judgment"/>
+                <label name="abstraction"/>
+                <field name="abstraction"/>
+                <label name="vocabulary"/>
+                <field name="vocabulary"/>
+                <label name="calculation_ability"/>
+                <field name="calculation_ability"/>
+                <label name="object_recognition"/>
+                <field name="object_recognition"/>
+                <label name="praxis"/>
+                <field name="praxis"/>
+            </group>
+        </page>
+        <page string="Diagnosis" id="page_patient_evaluation_diagnosis">
+            <label name="diagnosis"/>
+            <field name="diagnosis" colspan="3"/>
+            <newline/>
+            <field name="secondary_conditions" colspan="4"/>
+            <newline/>
+            <separator string="Information on Diagnosis" colspan="2" id="separator_evaluation_diagnosis_1"/>
+            <separator string="Treatment Plan" colspan="2" id="separator_evaluation_diagnosis_2"/>
+            <newline/>
+            <field name="info_diagnosis" colspan="2"/>
+            <field name="directions" colspan="2"/>
+            <newline/>
+            <field name="diagnostic_hypothesis" colspan="2"/>
+            <field name="actions" colspan="2"/>
+            <newline/>
+            <label name="evaluation_date"/>
+            <field name="evaluation_date"/>
+            <label name="derived_from"/>
+            <field name="derived_from"/>
+            <label name="next_evaluation"/>
+            <field name="next_evaluation"/>
+            <label name="derived_to"/>
+            <field name="derived_to"/>
+        </page>
+    </notebook>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_patient_evaluation_tree.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<tree string="Evaluations">
+    <field name="patient" expand="1"/>
+    <field name="visit_type"/>
+    <field name="evaluation_type"/>
+    <field name="urgency"/>
+    <field name="evaluation_start"/>
+    <field name="evaluation_length"/>
+    <field name="specialty"/>
+    <field name="doctor" expand="1"/>
+    <field name="state"/>
+    <field name="urgency"/>
+    <field name="bmi"/>
+    <field name="systolic"/>
+    <field name="diastolic"/>
+    <field name="diagnosis"/>
+    <field name="signed_by"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_patient_form.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0"?>
+<form string="patient">
+    <!-- Main Info -->
+    <group string="Main Info" id="patient_main_info">
+        <group colspan="3" id="patient_main_info_name">
+            <group colspan="3" col="9" id="patient_main_info_3">
+                <field colspan="5" name="name"/>
+                <field name="sex" width="60"/>
+                <label name="age"/>
+                <field name="age" width="80"/>
+                <field name="identification_code" width="80"/>
+            </group>
+            <newline/>
+            <group id="critical_info" string="Allergies and Critical Information">
+                <field height="120" name="critical_info"/>
+            </group>
+        </group>
+        <group id="patient__pic">
+            <field xfill="0" xexpand="1" name="photo" img_width="200" img_height="200" height="200" width="200" widget="image"/>
+        </group>
+    </group>
+    <newline/>
+    <notebook>
+        <page string="General Info" id="general_info">
+            <notebook>
+                <page string="Main" id="main_info_page">
+                    <group colspan="4" col="8" id="general_info">
+                        <label name="primary_care_doctor"/>
+                        <field name="primary_care_doctor"/>
+                        <label name="family"/>
+                        <field name="family"/>
+                        <field name="marital_status"/>
+                        <label name="current_insurance"/>
+                        <field name="current_insurance"/>
+                    </group>
+                    <newline/>
+                    <group string="Notepad" id="patient_notepad">
+                        <field height="100" name="general_info"/>
+                    </group>
+                    <newline/>
+                    <group colspan="4" col="8" id="patient_info_2">
+                        <label name="dob"/>
+                        <field name="dob"/>
+                        <label name="ssn"/>
+                        <field name="ssn"/>
+                        <label name="blood_type"/>
+                        <field name="blood_type" width="20"/>
+                        <field name="rh" width="20"/>
+                    </group>
+                </page>
+                <page string="Misc" id="misc_info_page">
+                    <group colspan="4" id="misc_info_group">
+                        <label name="current_address"/>
+                        <field name="current_address"/>
+                    </group>
+                    <newline/>
+                    <group colspan="4" col="6" id="misc_info_deceased">
+                        <label name="deceased"/>
+                        <field name="deceased"/>
+                        <label name="dod"/>
+                        <field name="dod"/>
+                        <label name="cod"/>
+                        <field name="cod"/>
+                    </group>
+                </page>
+            </notebook>
+        </page>
+        <!-- Patient Medication and Vaccinations -->
+        <page string="Medication" id="patient_medication">
+            <field name="medications"/>
+            <field name="vaccinations"/>
+        </page>
+        <!-- Patient Diseases -->
+        <page string="Diseases" id="patient_diseases">
+            <field name="diseases" colspan="4"/>
+        </page>
+        <!-- Patient Evaluations NOW as a shortcut
+        <page string="Evaluations" id="patient_evaluations">
+            <field name="evaluation_ids" colspan="4"/>
+        </page>
+        -->
+    </notebook>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_patient_medication_form.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0"?>
+<form string="Medication">
+    <notebook>
+        <page string="General Info" id="medication_general_info">
+            <group id="medication_header" string="Medication">
+                <label name="medicament"/>
+                <field name="medicament"/>
+                <label name="indication"/>
+                <field name="indication"/>
+            </group>
+            <newline/>
+            <newline/>
+            <group colspan="2" id="treatment_period" string="Treatment period">
+                <label name="start_treatment"/>
+                <field name="start_treatment"/>
+                <label name="end_treatment"/>
+                <field name="end_treatment"/>
+            </group>
+            <newline/>
+            <newline/>
+            <group id="treatment_status" string="Status">
+                <label name="is_active"/>
+                <field name="is_active"/>
+                <label name="course_completed"/>
+                <field name="course_completed"/>
+                <label name="discontinued"/>
+                <field name="discontinued"/>
+                <label name="discontinued_reason"/>
+                <field name="discontinued_reason"/>
+            </group>
+            <newline/>
+            <group id="medication_adeverse_effects" string="Adverse Reactions and Notes">
+                <field name="adverse_reaction"/>
+                <newline/>
+                <separator string="Notes" id="medication_notes"/>
+                <newline/>
+                <field name="notes"/>
+            </group>
+        </page>
+        <page id="medication_misc" string="Extra Info">
+            <group id="medicament_dosage_main">
+                <group id="medicament_form" string="Admnistration">
+                    <label name="form"/>
+                    <field name="form"/>
+                    <label name="route"/>
+                    <field name="route"/>
+                </group>
+                <newline/>
+                <group id="medicament_dosage" col="6" string="Dosage">
+                    <label name="dose"/>
+                    <field name="dose"/>
+                    <label name="dose_unit"/>
+                    <field name="dose_unit"/>
+                    <label name="qty"/>
+                    <field name="qty"/>
+                </group>
+                <newline/>
+                <group id="medicament_duration" string="Treatment duration">
+                    <label name="duration"/>
+                    <field name="duration"/>
+                    <label name="duration_period"/>
+                    <field name="duration_period"/>
+                </group>
+                <newline/>
+                <group string="Common Dosage" id="group_common_dosage">
+                    <label name="common_dosage"/>
+                    <field name="common_dosage"/>
+                    <label name="admin_times"/>
+                    <field name="admin_times"/>
+                </group>
+                <newline/>
+                <group col="6" colspan="4" string="Specific Dosage" id="group_specific_dosage">
+                    <label name="frequency"/>
+                    <field name="frequency"/>
+                    <label name="frequency_unit"/>
+                    <field name="frequency_unit"/>
+                    <label name="frequency_prn"/>
+                    <field name="frequency_prn"/>
+                </group>
+            </group>
+            <newline/>
+            <group id="medication_notes" string="Prescribing doctor">
+                <label name="doctor"/>
+                <field name="doctor"/>
+            </group>
+        </page>
+    </notebook>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_patient_medication_tree.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<tree string="Patient Medication" colors="If(Bool(Eval('is_active')),'blue','grey')">
+    <field name="medicament" expand="1"/>
+    <field name="start_treatment" expand="1"/>
+    <field name="end_treatment" expand="1"/>
+    <field name="course_completed"/>
+    <field name="discontinued"/>
+    <field name="is_active" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_patient_tree.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<tree string="patient">
+    <field name="name" expand="1"/>
+    <field name="lastname" expand="1"/>
+    <field name="ssn" expand="1"/>
+    <field name="identification_code" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_physician.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<form string="physician">
+    <group col="8" colspan="4" id="general_info">
+        <label name="name"/>
+        <field name="name"/>
+        <label name="institution"/>
+        <field name="institution"/>
+        <label name="main_specialty"/>
+        <field name="main_specialty"/>
+        <label name="code"/>
+        <field name="code"/>
+    </group>
+    <newline/>
+    <field name="specialties"/>
+    <newline/>
+    <separator string="Extra Info" id="physician_extra_info"/>
+    <newline/>
+    <field name="info" colspan="4"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_physician_tree.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<tree string="Health Professionals">
+    <field name="name" expand="1"/>
+    <field name="code" expand="1"/>
+    <field name="institution" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_prescription.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<form string="Prescription">
+    <group string="Patient and Doctor Information" id="prescription_patient_info">
+        <label name="patient"/>
+        <field name="patient"/>
+        <label name="prescription_id"/>
+        <field name="prescription_id"/>
+        <label name="prescription_date"/>
+        <field name="prescription_date"/>
+        <label name="doctor"/>
+        <field name="doctor"/>
+        <label name="pharmacy"/>
+        <field name="pharmacy"/>
+        <group colspan="2" id="prescription_warning">
+            <label name="pregnancy_warning"/>
+            <field name="pregnancy_warning"/>
+            <label name="prescription_warning_ack"/>
+            <field name="prescription_warning_ack"/>
+        </group>
+    </group>
+    <newline/>
+    <field name="prescription_line" colspan="4"/>
+    <newline/>
+    <group string="Notes" id="group_prescription_notes">
+        <field name="notes" colspan="4"/>
+    </group>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_prescription_line.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<form string="Prescription Line">
+    <label name="medicament"/>
+    <field name="medicament"/>
+    <label name="indication"/>
+    <field name="indication"/>
+    <label name="allow_substitution"/>
+    <field name="allow_substitution"/>
+    <label name="prnt"/>
+    <field name="prnt"/>
+    <newline/>
+    <label name="form"/>
+    <field name="form"/>
+    <label name="route"/>
+    <field name="route"/>
+    <label name="start_treatment"/>
+    <field name="start_treatment"/>
+    <label name="end_treatment"/>
+    <field name="end_treatment"/>
+    <newline/>
+    <group colspan="4" string="Dosage" id="group_dosage">
+        <group colspan="2" id="group_dose">
+            <label name="dose"/>
+            <field name="dose"/>
+            <label name="dose_unit"/>
+            <field name="dose_unit"/>
+        </group>
+        <label name="qty"/>
+        <field name="qty"/>
+        <newline/>
+        <separator colspan="4" string="Common Dosage" id="separator_common_dosage"/>
+        <newline/>
+        <label name="common_dosage"/>
+        <field name="common_dosage"/>
+        <label name="admin_times"/>
+        <field name="admin_times"/>
+        <newline/>
+        <separator colspan="4" string="Specific Dosage" id="separator_specific_dosage"/>
+        <newline/>
+        <group col="6" colspan="4" id="specific_dose">
+            <label name="frequency"/>
+            <field name="frequency"/>
+            <label name="frequency_unit"/>
+            <field name="frequency_unit"/>
+            <label name="frequency_prn"/>
+            <field name="frequency_prn"/>
+        </group>
+    </group>
+    <newline/>
+    <label name="duration"/>
+    <field name="duration"/>
+    <label name="duration_period"/>
+    <field name="duration_period"/>
+    <label name="review"/>
+    <field name="review"/>
+    <label name="quantity"/>
+    <field name="quantity"/>
+    <label name="refills"/>
+    <field name="refills"/>
+    <label name="short_comment"/>
+    <field name="short_comment"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_prescription_line_tree.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<tree string="Prescription lines">
+    <field name="prnt" expand="1"/>
+    <field name="medicament" expand="1"/>
+    <field name="indication" expand="1"/>
+    <field name="dose"/>
+    <field name="dose_unit"/>
+    <field name="form"/>
+    <field name="common_dosage"/>
+    <field name="quantity"/>
+    <field name="duration"/>
+    <field name="duration_period"/>
+    <field name="allow_substitution"/>
+    <field name="short_comment" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_prescription_tree.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<tree string="Prescription">
+    <field name="prescription_id" expand="1"/>
+    <field name="patient" expand="1"/>
+    <field name="doctor"/>
+    <field name="prescription_date" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_procedure_form.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<form string="Procedure">
+    <label name="name"/>
+    <field name="name"/>
+    <newline/>
+    <label name="description"/>
+    <field name="description"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_procedure_tree.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<tree string="Procedure">
+    <field name="name" expand="1"/>
+    <field name="description" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_product_form.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<data>
+    <xpath expr="/form/field[@name=&quot;active&quot;]" position="after">
+        <separator string="Health" id="health" colspan="6"/>
+        <group col="10" colspan="4" id="product_specs">
+            <label name="is_medicament"/>
+            <field name="is_medicament"/>
+            <label name="is_medical_supply"/>
+            <field name="is_medical_supply"/>
+            <label name="is_vaccine"/>
+            <field name="is_vaccine"/>
+            <label name="is_bed"/>
+            <field name="is_bed"/>
+            <label name="is_insurance_plan"/>
+            <field name="is_insurance_plan"/>
+        </group>
+    </xpath>
+</data>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_product_tree.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<data>
+    <xpath expr="/tree/field[@name=&quot;rec_name&quot;]" position="after">
+        <field name="is_medicament"/>
+        <field name="is_medical_supply"/>
+        <field name="is_vaccine"/>
+        <field name="is_bed"/>
+        <field name="is_insurance_plan"/>
+    </xpath>
+</data>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_secondary_condition_form.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<form string="Diagnostic Hypothesis">
+    <label name="pathology"/>
+    <field name="pathology"/>
+    <newline/>
+    <label name="comments"/>
+    <field name="comments"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_secondary_condition_tree.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<tree string="Patient Evaluation secondary condition">
+    <field name="pathology" expand="1"/>
+    <field name="comments" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_signs_and_symptoms_form.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<form string="Clinical Findinds - Signs and Symptoms">
+    <group colspan="4" string="Sign or Symptom" id="group_sign_symptom">
+        <field name="clinical"/>
+    </group>
+    <newline/>
+    <label name="sign_or_symptom"/>
+    <field name="sign_or_symptom"/>
+    <newline/>
+    <separator string="Comments" id="separator_signs_symptoms" colspan="4"/>
+    <newline/>
+    <field name="comments" colspan="4"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_signs_and_symptoms_tree.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<tree string="Clinical Findinds - Signs and Symptoms">
+    <field name="sign_or_symptom" expand="1"/>
+    <field name="clinical" expand="1"/>
+    <field name="comments" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_specialty.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<form string="specialty">
+    <group id="specialty_header">
+        <label name="name"/>
+        <field name="name"/>
+        <label name="code"/>
+        <field name="code"/>
+    </group>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_specialty_tree.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<tree string="Medical Specialties">
+    <field name="name" expand="1"/>
+    <field name="code" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_vaccination_form.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<form string="vaccination">
+    <group colspan="4" id="vaccination_header">
+        <group colspan="4" col="6" id="group_vaccine_dates">
+            <label name="vaccine"/>
+            <field name="vaccine"/>
+            <label name="admin_route"/>
+            <field name="admin_route"/>
+            <label name="dose"/>
+            <field name="dose"/>
+            <label name="next_dose_date"/>
+            <field name="next_dose_date"/>
+        </group>
+        <newline/>
+        <label name="date"/>
+        <field name="date"/>
+        <label name="institution"/>
+        <field name="institution"/>
+        <newline/>
+        <label name="vaccine_expiration_date"/>
+        <field name="vaccine_expiration_date"/>
+        <label name="vaccine_lot"/>
+        <field name="vaccine_lot"/>
+    </group>
+    <newline/>
+    <separator string="Notes" id="sepatator_vaccination_notes"/>
+    <newline/>
+    <field name="observations" colspan="4"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/gnuhealth_vaccination_tree.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<tree string="Patient vaccination">
+    <field name="vaccine" expand="1"/>
+    <field name="dose" expand="1"/>
+    <field name="date"/>
+    <field name="next_dose_date"/>
+    <field name="observations"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/party_address_form.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<data>
+    <xpath expr="/form/label[@name=&quot;party&quot;]" position="before">
+        <newline/>
+        <label name="relative_id"/>
+        <field name="relative_id"/>
+        <label name="relationship"/>
+        <field name="relationship"/>
+        <newline/>
+    </xpath>
+    <xpath expr="/form/group/field[@name=&quot;active&quot;]" position="after">
+        <label name="is_work"/>
+        <field name="is_work"/>
+        <label name="is_school"/>
+        <field name="is_school"/>
+    </xpath>
+</data>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/party_form.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+<data>
+    <xpath expr="/form/notebook/page[@id=&quot;general&quot;]" position="before">
+        <page string="Health" id="party_gnuhealth">
+            <group col="12" colspan="4" id="party_specs">
+                <label name="is_person"/>
+                <field name="is_person"/>
+                <label name="is_patient"/>
+                <field name="is_patient"/>
+                <label name="is_doctor"/>
+                <field name="is_doctor"/>
+                <label name="is_institution"/>
+                <field name="is_institution"/>
+                <label name="is_insurance_company"/>
+                <field name="is_insurance_company"/>
+                <label name="is_pharmacy"/>
+                <field name="is_pharmacy"/>
+            </group>
+            <newline/>
+            <group colspan="4" id="person_details" states="{'invisible': Not(Bool(Eval('is_person')))}">
+                <group id="person_demographics" string="Demographics">
+                    <label name="ref"/>
+                    <field name="ref"/>
+                    <label name="dob"/>
+                    <field name="dob"/>
+                    <label name="sex"/>
+                    <field name="sex"/>
+                    <label name="marital_status"/>
+                    <field name="marital_status"/>
+                    <label name="du"/>
+                    <field name="du"/>
+                    <label name="citizenship"/>
+                    <field name="citizenship"/>
+                    <label name="residence"/>
+                    <field name="residence"/>
+                    <label name="ethnic_group"/>
+                    <field name="ethnic_group"/>
+                    <label name="alternative_identification"/>
+                    <field name="alternative_identification"/>
+                    <label name="unidentified"/>
+                    <field name="unidentified"/>
+                </group>
+                <group string="Picture" id="person_picture">
+                    <field xfill="0" xexpand="1" name="photo" img_width="200" img_height="200" height="200" width="200" widget="image"/>
+                </group>
+                <newline/>
+            </group>
+            <newline/>
+            <field name="alternative_ids"/>
+            <newline/>
+            <group col="6" colspan="2" id="other_party_specs">
+                <label name="activation_date"/>
+                <field name="activation_date"/>
+                <label name="internal_user"/>
+                <field name="internal_user"/>
+            </group>
+            <newline/>
+            <field name="insurance" colspan="4"/>
+        </page>
+    </xpath>
+    <xpath expr="/form/field[@name=&quot;name&quot;]" position="after">
+        <label name="lastname"/>
+        <field name="lastname"/>
+        <label name="alias"/>
+        <field name="alias"/>
+    </xpath>
+</data>
new file mode 100644
--- /dev/null
+++ b/tryton/health/view/party_tree.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<data>
+    <xpath expr="/tree/field[@name=&quot;name&quot;]" position="after">
+        <field name="lastname" expand="1"/>
+        <field name="ref" expand="1"/>
+        <field name="is_person"/>
+        <field name="is_patient"/>
+        <field name="is_doctor"/>
+        <field name="is_institution"/>
+        <field name="is_pharmacy"/>
+        <field name="is_insurance_company"/>
+    </xpath>
+</data>
--- a/tryton/health_calendar/health_calendar_view.xml
+++ b/tryton/health_calendar/health_calendar_view.xml
@@ -8,20 +8,7 @@
             <field name="model">gnuhealth.physician</field>
             <field name="type">form</field>
             <field name="inherit" ref="health.gnuhealth_physician_view"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/form/group[@id=&quot;general_info&quot;]/field[@name=&quot;code&quot;]"
-                        position="after">
-
-                        <label name="calendar"/>
-                        <field name="calendar"/>
-
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_calendar_physician</field>
         </record>
             
     <!-- Appointment details -->
@@ -30,22 +17,7 @@
             <field name="model">gnuhealth.appointment</field>
             <field name="type">form</field>
             <field name="inherit" ref="health.gnuhealth_appointment_form"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/form/group[@id=&quot;appointment_header&quot;]/field[@name=&quot;appointment_date&quot;]"
-                        position="after">
-
-                        <label name="appointment_time"/>
-                        <field name="appointment_time"/>
-                        <label name="event"/>
-                        <field name="event"/>
-
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_calendar_appointment</field>
         </record>
 
     </data>
--- a/tryton/health_calendar/setup.py
+++ b/tryton/health_calendar/setup.py
@@ -60,7 +60,8 @@
     package_data={
         'trytond.modules.health_calendar': info.get('xml', []) \
             + info.get('translation', []) \
-            + ['tryton.cfg', 'doc/*.rst', 'locale/*.po', 'report/*.odt', 'icons/*.svg'],
+            + ['tryton.cfg', 'view/*.xml', 'doc/*.rst', 'locale/*.po',
+               'report/*.odt', 'icons/*.svg'],
         },
 
     classifiers=[
new file mode 100644
--- /dev/null
+++ b/tryton/health_calendar/view/gnuhealth_calendar_appointment.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<data>
+    <xpath expr="/form/group[@id=&quot;appointment_header&quot;]/field[@name=&quot;appointment_date&quot;]" position="after">
+        <label name="appointment_time"/>
+        <field name="appointment_time"/>
+        <label name="event"/>
+        <field name="event"/>
+    </xpath>
+</data>
new file mode 100644
--- /dev/null
+++ b/tryton/health_calendar/view/gnuhealth_calendar_physician.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<data>
+    <xpath expr="/form/group[@id=&quot;general_info&quot;]/field[@name=&quot;code&quot;]" position="after">
+        <label name="calendar"/>
+        <field name="calendar"/>
+    </xpath>
+</data>
--- a/tryton/health_genetics/health_genetics_view.xml
+++ b/tryton/health_genetics/health_genetics_view.xml
@@ -24,42 +24,13 @@
         <record model="ir.ui.view" id="gnuhealth_disease_gene_view">
             <field name="model">gnuhealth.disease.gene</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Medical Genetic Risks">
-                    <label name="name"/>
-                    <field name="name"/>
-                    <label name="long_name"/>
-                    <field name="long_name"/>
-                    <newline/>
-                    <label name="chromosome"/>
-                    <field name="chromosome"/>
-                    <label name="dominance"/>
-                    <field name="dominance"/>
-                    <label name="location"/>
-                    <field name="location"/>
-                    <label name="gene_id"/>
-                    <field name="gene_id"/>
-                    <newline/>
-                    <field colspan="4" name="info"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_disease_gene</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_disease_gene_tree">
             <field name="model">gnuhealth.disease.gene</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Disease Genes">
-                    <field name="name"/>
-                    <field name="long_name"/>
-                    <field name="chromosome"/>
-                    <field name="dominance"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_disease_gene_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="gnuhealth_action_disease_gene">
@@ -87,29 +58,13 @@
         <record model="ir.ui.view" id="gnuhealth_genetic_risk_view">
             <field name="model">gnuhealth.patient.genetic.risk</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Patient Genetic Risks">
-                    <label name="patient"/>
-                    <field name="patient"/>
-                    <label name="disease_gene"/>
-                    <field name="disease_gene"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_genetic_risk</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_genetic_risk_tree">
             <field name="model">gnuhealth.patient.genetic.risk</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Patient Genetic Risks">
-                    <field name="patient"/>
-                    <field name="disease_gene" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_genetic_risk_tree</field>
         </record>
 
 <!-- Family Diseases -->
@@ -117,33 +72,13 @@
         <record model="ir.ui.view" id="gnuhealth_family_diseases_view">
             <field name="model">gnuhealth.patient.family.diseases</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Patient Genetic Family Diseases">
-                    <label name="name"/>
-                    <field colspan="4" name="name"/>
-                    <newline/>
-                    <label name="xory"/>
-                    <field name="xory"/>
-                    <label name="relative"/>
-                    <field name="relative"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_family_diseases</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_family_diseases_tree">
             <field name="model">gnuhealth.patient.family.diseases</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Genetic Family Diseases">
-                    <field name="name"/>
-                    <field name="xory"/>
-                    <field name="relative" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_family_diseases_tree</field>
         </record>
 
 <!-- Include Family History and Genetic Risks on the patient chart -->
@@ -152,22 +87,7 @@
             <field name="model">gnuhealth.patient</field>
             <field name="inherit" ref="health.gnuhealth_patient_view_form" />
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/form/notebook/page[@id=&quot;patient_diseases&quot;]"
-                        position="after">
-
-                        <page string="Genetics" id="patient_genetics">
-                            <field name="genetic_risks"/>
-                            <field name="family_history"/>
-                        </page>
-
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_patient</field>
         </record>
 
     </data>
--- a/tryton/health_genetics/setup.py
+++ b/tryton/health_genetics/setup.py
@@ -60,7 +60,8 @@
     package_data={
         'trytond.modules.health_genetics': info.get('xml', []) \
             + info.get('translation', []) \
-            + ['tryton.cfg', 'doc/*.rst', 'locale/*.po', 'report/*.odt', 'icons/*.svg'],
+            + ['tryton.cfg', 'view/*.xml', 'doc/*.rst', 'locale/*.po',
+               'report/*.odt', 'icons/*.svg'],
         },
 
     classifiers=[
new file mode 100644
--- /dev/null
+++ b/tryton/health_genetics/view/gnuhealth_disease_gene.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<form string="Medical Genetic Risks">
+    <label name="name"/>
+    <field name="name"/>
+    <label name="long_name"/>
+    <field name="long_name"/>
+    <newline/>
+    <label name="chromosome"/>
+    <field name="chromosome"/>
+    <label name="dominance"/>
+    <field name="dominance"/>
+    <label name="location"/>
+    <field name="location"/>
+    <label name="gene_id"/>
+    <field name="gene_id"/>
+    <newline/>
+    <field colspan="4" name="info"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_genetics/view/gnuhealth_disease_gene_tree.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<tree string="Disease Genes">
+    <field name="name"/>
+    <field name="long_name"/>
+    <field name="chromosome"/>
+    <field name="dominance"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_genetics/view/gnuhealth_family_diseases.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<form string="Patient Genetic Family Diseases">
+    <label name="name"/>
+    <field colspan="4" name="name"/>
+    <newline/>
+    <label name="xory"/>
+    <field name="xory"/>
+    <label name="relative"/>
+    <field name="relative"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_genetics/view/gnuhealth_family_diseases_tree.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<tree string="Genetic Family Diseases">
+    <field name="name"/>
+    <field name="xory"/>
+    <field name="relative" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_genetics/view/gnuhealth_genetic_risk.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<form string="Patient Genetic Risks">
+    <label name="patient"/>
+    <field name="patient"/>
+    <label name="disease_gene"/>
+    <field name="disease_gene"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_genetics/view/gnuhealth_genetic_risk_tree.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<tree string="Patient Genetic Risks">
+    <field name="patient"/>
+    <field name="disease_gene" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_genetics/view/gnuhealth_patient.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<data>
+    <xpath expr="/form/notebook/page[@id=&quot;patient_diseases&quot;]" position="after">
+        <page string="Genetics" id="patient_genetics">
+            <field name="genetic_risks"/>
+            <field name="family_history"/>
+        </page>
+    </xpath>
+</data>
--- a/tryton/health_gyneco/health_gyneco_view.xml
+++ b/tryton/health_gyneco/health_gyneco_view.xml
@@ -8,69 +8,13 @@
         <record model="ir.ui.view" id="gnuhealth_patient_pregnancy_view">
             <field name="model">gnuhealth.patient.pregnancy</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Pregnancies">
-                    <group id="group_pregnancy_header" colspan="4" col="8">
-                        <label name="gravida"/>
-                        <field name="gravida"/>
-                        <label name="lmp"/>
-                        <field name="lmp"/>
-                        <label name="pdd"/>
-                        <field name="pdd"/>
-                        <label name="current_pregnancy"/>
-                        <field name="current_pregnancy"/>
-                    </group>
-
-                    <newline/>
-                    <field colspan="4" name="prenatal_evaluations"/>
-
-                    <newline/>
-                    <field name="perinatal"/>
-                    <field name="puerperium_monitor"/>
-                    <newline/>
-
-                    <group id="group_pregnancy_footer1" colspan="4" col="8">                    
-                        <label name="fetuses"/>
-                        <field name="fetuses"/>
-                        <label name="monozygotic"/>
-                        <field name="monozygotic"/>
-                        <label name="iugr"/>
-                        <field name="iugr"/>
-                        <label name="warning"/>
-                        <field name="warning"/>
-                    </group>
-                    <newline/>
-                    <group id="group_pregnancy_footer2" colspan="4" col="4">                                            
-                        <label name="pregnancy_end_date"/>
-                        <field name="pregnancy_end_date"/>
-                        <label name="pregnancy_end_result"/>
-                        <field name="pregnancy_end_result"/>
-                    </group>    
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_patient_pregnancy</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_patient_pregnancy_tree">
             <field name="model">gnuhealth.patient.pregnancy</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string='Pregnancies' colors="If(Bool(Eval('warning')),'orange','black')">
-                    <field name="gravida"/>
-                    <field name="lmp" expand="1"/>
-                    <field name="pdd" expand="1"/>
-                    <field name="current_pregnancy" expand="1"/>
-                    <field name="pregnancy_end_date" expand="1"/>
-                    <field name="pregnancy_end_age" expand="1"/>
-                    <field name="pregnancy_end_result" expand="1"/>
-                    <field name="iugr" expand="1"/>
-                    <field name="fetuses" expand="1"/>
-                    <field name="warning" expand="1"/>                    
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_patient_pregnancy_tree</field>
         </record>
 
 
@@ -79,91 +23,13 @@
         <record model="ir.ui.view" id="gnuhealth_prenatal_evaluation_view">
             <field name="model">gnuhealth.patient.prenatal.evaluation</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Prenatal Evaluation">
-                    <group id="prenatal_evaluation_group_header" colspan="4" col="4">
-                        <label name="evaluation_date"/>
-                        <field name="evaluation_date"/>
-                        <label name="gestational_weeks"/>
-                        <field name="gestational_weeks"/>                                               
-                    </group>
-                    <group string="Mother Information" id="prenatal_evaluation_group_mother" colspan="4" col="8">
-                    
-                        <label name="hypertension"/>
-                        <field name="hypertension"/>
-                        <label name="preeclampsia"/>
-                        <field name="preeclampsia"/>
-                        <label name="overweight"/>
-                        <field name="overweight"/>
-                        <label name="diabetes"/>
-                        <field name="diabetes"/>
-
-                    </group>
-
-                    <group string="Placenta" id="prenatal_evaluation_group_placenta" colspan="4" col="6">
-                        <label name="placenta_previa"/>
-                        <field name="placenta_previa"/>
-                        <label name="invasive_placentation"/>
-                        <field name="invasive_placentation"/>
-                        <label name="vasa_previa"/>
-                        <field name="vasa_previa"/>
-                    </group>
-
-                    <newline/>
-                    
-                    <group string="Fetus Information" id="prenatal_evaluation_group_fetus" colspan="4" col="8">
-                        <label name="fundal_height"/>
-                        <field name="fundal_height"/>                                               
-                        <label name="fetus_heart_rate"/>
-                        <field name="fetus_heart_rate"/>                                               
-                        <label name="efw"/>
-                        <field name="efw"/>                                               
-
-                        <newline/>
-                        <separator colspan="4" string="Fetal Biometry" id="separator_fetal_biometry"/>
-                        <newline/>
-
-                        <label name="fetal_bpd"/>
-                        <field name="fetal_bpd"/>                                               
-                        <label name="fetal_hc"/>
-                        <field name="fetal_hc"/>                                               
-                        <label name="fetal_ac"/>
-                        <field name="fetal_ac"/>                                               
-                        <label name="fetal_fl"/>
-                        <field name="fetal_fl"/>                                               
-
-                    </group>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_prenatal_evaluation</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_prenatal_evaluation_tree">
             <field name="model">gnuhealth.patient.prenatal.evaluation</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string='Prenatal Evaluations'>
-                    <field name="evaluation_date" expand="1"/>
-                    <field name="gestational_weeks" expand="1"/>                                               
-                    <field name="fundal_height" expand="1"/>                                               
-                    <field name="fetus_heart_rate" expand="1"/>
-                    <field name="efw" expand="1"/>
-                    <field name="iugr" expand="1"/>                    
-                    <field name="hypertension" expand="1"/>                                                                   
-                    <field name="preeclampsia" expand="1"/>                                                                   
-                    <field name="overweight" expand="1"/>                                               
-                    <field name="diabetes" expand="1"/>                                               
-                    <field name="invasive_placentation" expand="1"/>                                               
-                    <field name="placenta_previa" expand="1"/>                                               
-                    <field name="vasa_previa" expand="1"/>                                               
-                    <field name="oligohydramnios" expand="1"/>                                               
-                    <field name="polihydramnios" expand="1"/>                                               
-
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_prenatal_evaluation_tree</field>
         </record>
 
 
@@ -174,84 +40,13 @@
         <record model="ir.ui.view" id="gnuhealth_perinatal_view">
             <field name="model">gnuhealth.perinatal</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Perinatal and Intrapartum Information">
-                    <notebook>
-                        <page string="Main" id="page_main_perinatal">
-
-                            <group id="group_perinatal_holder" colspan="4" col="6">
-                                <label name="gestational_weeks"/>
-                                <field name="gestational_weeks"/>
-                                <label name="admission_date"/>
-                                <field name="admission_date"/>
-                                <label name="admission_code"/>
-                                <field name="admission_code"/>
-                            </group>
-
-                            <newline/>
-
-                            <group id="group_labor">
-                                <label name="start_labor_mode"/>
-                                <field name="start_labor_mode"/>
-                                <label name="fetus_presentation"/>
-                                <field name="fetus_presentation"/>
-                            </group>
-                            <newline/>
-                            <field colspan="4" name="monitoring"/>
-                            <newline/>
-
-                            <separator colspan="4" string="Notes" id="perinatal_notes_separator"/>
-                            <field name="notes"/>
-                        </page>
-
-
-                        <page id="perinatal_misc" string="Additional Info">
-
-                            <group colspan="4" col="8" id="group_misc">
-                                <label name="dystocia"/>
-                                <field name="dystocia"/>
-                                <label name="episiotomy"/>
-                                <field name="episiotomy"/>
-                                <label name="laceration"/>
-                                <field name="laceration"/>                                
-                                <label name="hematoma"/>
-                                <field name="hematoma"/>                                
-
-                            </group>
-
-                            <newline/>
-                            <separator colspan="4" id="separator_placenta" string="Placenta anomalies"/>
-                            <newline/>
-                            
-                            <group colspan="4" col="10" id="group_placenta">
-                                <label name="placenta_incomplete"/>
-                                <field name="placenta_incomplete"/>
-                                <label name="placenta_retained"/>
-                                <field name="placenta_retained"/>
-                                <label name="abruptio_placentae"/>
-                                <field name="abruptio_placentae"/>
-                            </group>
-                                                       
-                        </page>
-
-                    </notebook>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_perinatal</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_perinatal_tree">
             <field name="model">gnuhealth.perinatal</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string='Perinatal and Intrapartum Information'>
-                    <field name="admission_date" expand="1"/>
-                    <field name="gestational_weeks" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_perinatal_tree</field>
         </record>
 
 <!-- Puerperium -->
@@ -259,44 +54,13 @@
         <record model="ir.ui.view" id="gnuhealth_puerperium_monitor_view">
             <field name="model">gnuhealth.puerperium.monitor</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Puerperium Monitor">
-                    <group colspan="4" string="Main" id="group_puerperium_monitor">
-                        <label name="date"/>
-                        <field name="date"/>
-                        <label name="uterus_involution"/>
-                        <field name="uterus_involution"/>
-                    </group>
-                    <newline/>
-                    <group colspan="4" string="Lochia" id="group_lochia">
-                        <label name="lochia_amount"/>
-                        <field name="lochia_amount"/>
-                        <label name="lochia_color"/>
-                        <field name="lochia_color"/>
-                        <label name="lochia_odor"/>
-                        <field name="lochia_odor"/>
-                        <newline/>
-                    </group>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_puerperium_monitor</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_puerperium_monitor_tree">
             <field name="model">gnuhealth.puerperium.monitor</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string='Puerperium Monitor'>
-                    <field name="date" expand="1"/>
-                    <field name="uterus_involution" expand="1"/>
-                    <field name="lochia_amount" expand="1"/>
-                    <field name="lochia_color" expand="1"/>
-                    <field name="lochia_odor" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_puerperium_monitor_tree</field>
         </record>
 
 <!-- Perinatal Monitoring -->
@@ -304,68 +68,13 @@
         <record model="ir.ui.view" id="gnuhealth_perinatal_monitor_view">
             <field name="model">gnuhealth.perinatal.monitor</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Perinatal Monitor">
-                    <group colspan="4" string="Mother" id="group_perinatal_mother_monitor">
-                        <label name="date"/>
-                        <field name="date"/>
-                        <newline/>
-                        <label name="systolic"/>
-                        <field name="systolic"/>
-                        <label name="diastolic"/>
-                        <field name="diastolic"/>
-                        <label name="frequency"/>
-                        <field name="frequency"/>
-                        <newline/>
-                        <label name="contractions"/>
-                        <field name="contractions"/>
-                        <label name="dilation"/>
-                        <field name="dilation"/>
-                        <label name="fundal_height"/>
-                        <field name="fundal_height"/>
-                        <newline/>
-                    </group>
-                    <newline/>
-                    <group colspan="4" string="Fetus" id="group_perinatal_fetus_monitor">
-
-                        <label name="fetus_position"/>
-                        <field name="fetus_position"/>
-                        <label name="f_frequency"/>
-                        <field name="f_frequency"/>
-                        <newline/>
-                    </group>
-                    <newline/>
-                    <group colspan="4" string="Complications" id="group_perinatal_complications">
-                        <label name="bleeding"/>
-                        <field name="bleeding"/>
-                        <label name="meconium"/>
-                        <field name="meconium"/>
-                    </group>
-                    <newline/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_perinatal_monitor</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_perinatal_monitor_tree">
             <field name="model">gnuhealth.perinatal.monitor</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string='Perinatal Monitor'>
-                    <field name="date" expand="1"/>
-                    <field name="dilation" expand="1"/>
-                    <field name="systolic" expand="1"/>
-                    <field name="diastolic" expand="1"/>
-                    <field name="frequency" expand="1"/>
-                    <field name="fetus_position" expand="1"/>
-                    <field name="f_frequency" expand="1"/>
-                    <field name="bleeding" expand="1"/>
-                    <field name="meconium" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_perinatal_monitor_tree</field>
         </record>
 
 
@@ -374,48 +83,13 @@
         <record model="ir.ui.view" id="gnuhealth_menstrual_history_view">
             <field name="model">gnuhealth.patient.menstrual_history</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Patient Menstrual History">
-                    <label name="name"/>
-                    <field name="name"/>
-                    <label name="evaluation"/>
-                    <field name="evaluation"/>
-                    <label name="evaluation_date"/>
-                    <field name="evaluation_date"/>
-                    <label name="lmp"/>
-                    <field name="lmp"/>
-                    <label name="lmp_length"/>
-                    <field name="lmp_length"/>
-                    <label name="frequency"/>
-                    <field name="frequency"/>
-                    <label name="volume"/>
-                    <field name="volume"/>
-                    <label name="is_regular"/>
-                    <field name="is_regular"/>
-                    <label name="dysmenorrhea"/>
-                    <field name="dysmenorrhea"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_menstrual_history</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_menstrual_history_tree">
             <field name="model">gnuhealth.patient.menstrual_history</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree editable="top" string='Menstrual History'>
-                    <field name="evaluation_date" expand="1"/>
-                    <field name="lmp" expand="1"/>
-                    <field name="lmp_length" expand="1"/>
-                    <field name="frequency" expand="1"/>
-                    <field name="volume" expand="1"/>
-                    <field name="is_regular" expand="1"/>
-                    <field name="dysmenorrhea" expand="1"/>                    
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_menstrual_history_tree</field>
         </record>
 
 <!-- PAP history information -->
@@ -423,38 +97,13 @@
         <record model="ir.ui.view" id="gnuhealth_pap_history_view">
             <field name="model">gnuhealth.patient.pap_history</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Patient pap History">
-                    <label name="name"/>
-                    <field name="name"/>
-                    <label name="evaluation"/>
-                    <field name="evaluation"/>
-                    <label name="evaluation_date"/>
-                    <field name="evaluation_date"/>
-                    <label name="last_pap"/>
-                    <field name="last_pap"/>
-                    <label name="result"/>
-                    <field name="result"/>
-                    <label name="comments"/>
-                    <field name="comments"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_pap_history</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_pap_history_tree">
             <field name="model">gnuhealth.patient.pap_history</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree editable="top" string='PAP Tests'>
-                    <field name="last_pap" expand="1"/>
-                    <field name="result" expand="1"/>                    
-                    <field name="comments" expand="1"/>                    
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_pap_history_tree</field>
         </record>
 
 
@@ -463,39 +112,13 @@
         <record model="ir.ui.view" id="gnuhealth_mammography_history_view">
             <field name="model">gnuhealth.patient.mammography_history</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Patient mammography History">
-                    <label name="name"/>
-                    <field name="name"/>
-                    <label name="evaluation"/>
-                    <field name="evaluation"/>
-                    <label name="evaluation_date"/>
-                    <field name="evaluation_date"/>
-                    <label name="last_mammography"/>
-                    <field name="last_mammography"/>
-                    <label name="result"/>
-                    <field name="result"/>
-                    <label name="comments"/>
-                    <field name="comments"/>
-
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_mammography_history</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_mammography_history_tree">
             <field name="model">gnuhealth.patient.mammography_history</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree editable="top" string='Mammography Tests'>
-                    <field name="last_mammography" expand="1"/>
-                    <field name="result" expand="1"/>                    
-                    <field name="comments" expand="1"/>                    
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_mammography_history_tree</field>
         </record>
 
 <!-- Colposcopy history information -->
@@ -503,38 +126,13 @@
         <record model="ir.ui.view" id="gnuhealth_colposcopy_history_view">
             <field name="model">gnuhealth.patient.colposcopy_history</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Patient colposcopy History">
-                    <label name="name"/>
-                    <field name="name"/>
-                    <label name="evaluation"/>
-                    <field name="evaluation"/>
-                    <label name="evaluation_date"/>
-                    <field name="evaluation_date"/>
-                    <label name="last_colposcopy"/>
-                    <field name="last_colposcopy"/>
-                    <label name="result"/>
-                    <field name="result"/>
-                    <label name="comments"/>
-                    <field name="comments"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_colposcopy_history</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_colposcopy_history_tree">
             <field name="model">gnuhealth.patient.colposcopy_history</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree editable="top" string='Colposcopy Tests'>
-                    <field name="last_colposcopy" expand="1"/>
-                    <field name="result" expand="1"/>                    
-                    <field name="comments" expand="1"/>                    
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_colposcopy_history_tree</field>
         </record>
 
 
@@ -544,78 +142,7 @@
             <field name="model">gnuhealth.patient</field>
             <field name="inherit" ref="health.gnuhealth_patient_view_form" />
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/form/notebook/page[@id=&quot;patient_diseases&quot;]"
-                        position="after">
-
-                        <page
-                            string="Gyneco / Obs" id="page_gyneco_obs"
-                            states="{'invisible': Equal(Eval('sex'), 'm')}">
-                            <notebook>
-
-                                <page string="Gyneco" id="page_gyneco">
-                                    <group colspan="4" col="10" string="General" id="group_gyneco_general">
-                                        <label name="fertile"/>
-                                        <field name="fertile"/>
-                                        <label name="currently_pregnant"/>
-                                        <field name="currently_pregnant"/>
-                                        <label name="menarche"/>
-                                        <field name="menarche"/>
-                                        <label name="menopausal"/>
-                                        <field name="menopausal"/>
-                                        <label name="menopause"/>
-                                        <field name="menopause"/>
-                                    </group>
-                                    <newline/>
-                                    <field name="menstrual_history"/>
-
-                                </page>
-
-                                <page string="Screening" id="page_gyneco">
-                                    <group colspan="4" col="8" id="group_prevention">
-                                        <label name="breast_self_examination"/>
-                                        <field name="breast_self_examination"/>
-                                        <label name="mammography"/>
-                                        <field name="mammography"/>
-                                        <label name="pap_test"/>
-                                        <field name="pap_test"/>
-                                        <label name="colposcopy"/>
-                                        <field name="colposcopy"/>
-                                    </group>
-                                    <newline/>
-                                    <field colspan="4" name="mammography_history"/>
-                                    
-                                </page>
-
-                                <page string="Pap / Colpo" id="page_pap_colpo">
-                                    <field name="pap_history"/>
-                                    <field name="colposcopy_history"/>                                    
-                                </page>
-
-                                <page string="Obstetrics" id="page_obs">
-                                    <group colspan="4" col="12" id="group_obstetrics">
-                                        <label name="gravida"/>
-                                        <field name="gravida"/>
-                                        <label name="premature"/>
-                                        <field name="premature"/>
-                                        <label name="stillbirths"/>
-                                        <field name="stillbirths"/>
-                                        <label name="abortions"/>
-                                        <field name="abortions"/>
-                                    </group>
-                                        <field name="pregnancy_history"/>
-                                </page>
-
-                            </notebook>
-                        </page>
-
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_patient</field>
         </record>
 
 
--- a/tryton/health_gyneco/setup.py
+++ b/tryton/health_gyneco/setup.py
@@ -60,7 +60,8 @@
     package_data={
         'trytond.modules.health_gyneco': info.get('xml', []) \
             + info.get('translation', []) \
-            + ['tryton.cfg', 'doc/*.rst', 'locale/*.po', 'report/*.odt', 'icons/*.svg'],
+            + ['tryton.cfg', 'view/*.xml', 'doc/*.rst', 'locale/*.po',
+               'report/*.odt', 'icons/*.svg'],
         },
 
     classifiers=[
new file mode 100644
--- /dev/null
+++ b/tryton/health_gyneco/view/gnuhealth_colposcopy_history.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<form string="Patient colposcopy History">
+    <label name="name"/>
+    <field name="name"/>
+    <label name="evaluation"/>
+    <field name="evaluation"/>
+    <label name="evaluation_date"/>
+    <field name="evaluation_date"/>
+    <label name="last_colposcopy"/>
+    <field name="last_colposcopy"/>
+    <label name="result"/>
+    <field name="result"/>
+    <label name="comments"/>
+    <field name="comments"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_gyneco/view/gnuhealth_colposcopy_history_tree.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<tree editable="top" string="Colposcopy Tests">
+    <field name="last_colposcopy" expand="1"/>
+    <field name="result" expand="1"/>
+    <field name="comments" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_gyneco/view/gnuhealth_mammography_history.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<form string="Patient mammography History">
+    <label name="name"/>
+    <field name="name"/>
+    <label name="evaluation"/>
+    <field name="evaluation"/>
+    <label name="evaluation_date"/>
+    <field name="evaluation_date"/>
+    <label name="last_mammography"/>
+    <field name="last_mammography"/>
+    <label name="result"/>
+    <field name="result"/>
+    <label name="comments"/>
+    <field name="comments"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_gyneco/view/gnuhealth_mammography_history_tree.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<tree editable="top" string="Mammography Tests">
+    <field name="last_mammography" expand="1"/>
+    <field name="result" expand="1"/>
+    <field name="comments" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_gyneco/view/gnuhealth_menstrual_history.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<form string="Patient Menstrual History">
+    <label name="name"/>
+    <field name="name"/>
+    <label name="evaluation"/>
+    <field name="evaluation"/>
+    <label name="evaluation_date"/>
+    <field name="evaluation_date"/>
+    <label name="lmp"/>
+    <field name="lmp"/>
+    <label name="lmp_length"/>
+    <field name="lmp_length"/>
+    <label name="frequency"/>
+    <field name="frequency"/>
+    <label name="volume"/>
+    <field name="volume"/>
+    <label name="is_regular"/>
+    <field name="is_regular"/>
+    <label name="dysmenorrhea"/>
+    <field name="dysmenorrhea"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_gyneco/view/gnuhealth_menstrual_history_tree.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<tree editable="top" string="Menstrual History">
+    <field name="evaluation_date" expand="1"/>
+    <field name="lmp" expand="1"/>
+    <field name="lmp_length" expand="1"/>
+    <field name="frequency" expand="1"/>
+    <field name="volume" expand="1"/>
+    <field name="is_regular" expand="1"/>
+    <field name="dysmenorrhea" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_gyneco/view/gnuhealth_pap_history.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<form string="Patient pap History">
+    <label name="name"/>
+    <field name="name"/>
+    <label name="evaluation"/>
+    <field name="evaluation"/>
+    <label name="evaluation_date"/>
+    <field name="evaluation_date"/>
+    <label name="last_pap"/>
+    <field name="last_pap"/>
+    <label name="result"/>
+    <field name="result"/>
+    <label name="comments"/>
+    <field name="comments"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_gyneco/view/gnuhealth_pap_history_tree.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<tree editable="top" string="PAP Tests">
+    <field name="last_pap" expand="1"/>
+    <field name="result" expand="1"/>
+    <field name="comments" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_gyneco/view/gnuhealth_patient.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+<data>
+    <xpath expr="/form/notebook/page[@id=&quot;patient_diseases&quot;]" position="after">
+        <page string="Gyneco / Obs" id="page_gyneco_obs" states="{'invisible': Equal(Eval('sex'), 'm')}">
+            <notebook>
+                <page string="Gyneco" id="page_gyneco">
+                    <group colspan="4" col="10" string="General" id="group_gyneco_general">
+                        <label name="fertile"/>
+                        <field name="fertile"/>
+                        <label name="currently_pregnant"/>
+                        <field name="currently_pregnant"/>
+                        <label name="menarche"/>
+                        <field name="menarche"/>
+                        <label name="menopausal"/>
+                        <field name="menopausal"/>
+                        <label name="menopause"/>
+                        <field name="menopause"/>
+                    </group>
+                    <newline/>
+                    <field name="menstrual_history"/>
+                </page>
+                <page string="Screening" id="page_gyneco">
+                    <group colspan="4" col="8" id="group_prevention">
+                        <label name="breast_self_examination"/>
+                        <field name="breast_self_examination"/>
+                        <label name="mammography"/>
+                        <field name="mammography"/>
+                        <label name="pap_test"/>
+                        <field name="pap_test"/>
+                        <label name="colposcopy"/>
+                        <field name="colposcopy"/>
+                    </group>
+                    <newline/>
+                    <field colspan="4" name="mammography_history"/>
+                </page>
+                <page string="Pap / Colpo" id="page_pap_colpo">
+                    <field name="pap_history"/>
+                    <field name="colposcopy_history"/>
+                </page>
+                <page string="Obstetrics" id="page_obs">
+                    <group colspan="4" col="12" id="group_obstetrics">
+                        <label name="gravida"/>
+                        <field name="gravida"/>
+                        <label name="premature"/>
+                        <field name="premature"/>
+                        <label name="stillbirths"/>
+                        <field name="stillbirths"/>
+                        <label name="abortions"/>
+                        <field name="abortions"/>
+                    </group>
+                    <field name="pregnancy_history"/>
+                </page>
+            </notebook>
+        </page>
+    </xpath>
+</data>
new file mode 100644
--- /dev/null
+++ b/tryton/health_gyneco/view/gnuhealth_patient_pregnancy.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<form string="Pregnancies">
+    <group id="group_pregnancy_header" colspan="4" col="8">
+        <label name="gravida"/>
+        <field name="gravida"/>
+        <label name="lmp"/>
+        <field name="lmp"/>
+        <label name="pdd"/>
+        <field name="pdd"/>
+        <label name="current_pregnancy"/>
+        <field name="current_pregnancy"/>
+    </group>
+    <newline/>
+    <field colspan="4" name="prenatal_evaluations"/>
+    <newline/>
+    <field name="perinatal"/>
+    <field name="puerperium_monitor"/>
+    <newline/>
+    <group id="group_pregnancy_footer1" colspan="4" col="8">
+        <label name="fetuses"/>
+        <field name="fetuses"/>
+        <label name="monozygotic"/>
+        <field name="monozygotic"/>
+        <label name="iugr"/>
+        <field name="iugr"/>
+        <label name="warning"/>
+        <field name="warning"/>
+    </group>
+    <newline/>
+    <group id="group_pregnancy_footer2" colspan="4" col="4">
+        <label name="pregnancy_end_date"/>
+        <field name="pregnancy_end_date"/>
+        <label name="pregnancy_end_result"/>
+        <field name="pregnancy_end_result"/>
+    </group>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_gyneco/view/gnuhealth_patient_pregnancy_tree.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<tree string="Pregnancies" colors="If(Bool(Eval('warning')),'orange','black')">
+    <field name="gravida"/>
+    <field name="lmp" expand="1"/>
+    <field name="pdd" expand="1"/>
+    <field name="current_pregnancy" expand="1"/>
+    <field name="pregnancy_end_date" expand="1"/>
+    <field name="pregnancy_end_age" expand="1"/>
+    <field name="pregnancy_end_result" expand="1"/>
+    <field name="iugr" expand="1"/>
+    <field name="fetuses" expand="1"/>
+    <field name="warning" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_gyneco/view/gnuhealth_perinatal.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<form string="Perinatal and Intrapartum Information">
+    <notebook>
+        <page string="Main" id="page_main_perinatal">
+            <group id="group_perinatal_holder" colspan="4" col="6">
+                <label name="gestational_weeks"/>
+                <field name="gestational_weeks"/>
+                <label name="admission_date"/>
+                <field name="admission_date"/>
+                <label name="admission_code"/>
+                <field name="admission_code"/>
+            </group>
+            <newline/>
+            <group id="group_labor">
+                <label name="start_labor_mode"/>
+                <field name="start_labor_mode"/>
+                <label name="fetus_presentation"/>
+                <field name="fetus_presentation"/>
+            </group>
+            <newline/>
+            <field colspan="4" name="monitoring"/>
+            <newline/>
+            <separator colspan="4" string="Notes" id="perinatal_notes_separator"/>
+            <field name="notes"/>
+        </page>
+        <page id="perinatal_misc" string="Additional Info">
+            <group colspan="4" col="8" id="group_misc">
+                <label name="dystocia"/>
+                <field name="dystocia"/>
+                <label name="episiotomy"/>
+                <field name="episiotomy"/>
+                <label name="laceration"/>
+                <field name="laceration"/>
+                <label name="hematoma"/>
+                <field name="hematoma"/>
+            </group>
+            <newline/>
+            <separator colspan="4" id="separator_placenta" string="Placenta anomalies"/>
+            <newline/>
+            <group colspan="4" col="10" id="group_placenta">
+                <label name="placenta_incomplete"/>
+                <field name="placenta_incomplete"/>
+                <label name="placenta_retained"/>
+                <field name="placenta_retained"/>
+                <label name="abruptio_placentae"/>
+                <field name="abruptio_placentae"/>
+            </group>
+        </page>
+    </notebook>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_gyneco/view/gnuhealth_perinatal_monitor.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<form string="Perinatal Monitor">
+    <group colspan="4" string="Mother" id="group_perinatal_mother_monitor">
+        <label name="date"/>
+        <field name="date"/>
+        <newline/>
+        <label name="systolic"/>
+        <field name="systolic"/>
+        <label name="diastolic"/>
+        <field name="diastolic"/>
+        <label name="frequency"/>
+        <field name="frequency"/>
+        <newline/>
+        <label name="contractions"/>
+        <field name="contractions"/>
+        <label name="dilation"/>
+        <field name="dilation"/>
+        <label name="fundal_height"/>
+        <field name="fundal_height"/>
+        <newline/>
+    </group>
+    <newline/>
+    <group colspan="4" string="Fetus" id="group_perinatal_fetus_monitor">
+        <label name="fetus_position"/>
+        <field name="fetus_position"/>
+        <label name="f_frequency"/>
+        <field name="f_frequency"/>
+        <newline/>
+    </group>
+    <newline/>
+    <group colspan="4" string="Complications" id="group_perinatal_complications">
+        <label name="bleeding"/>
+        <field name="bleeding"/>
+        <label name="meconium"/>
+        <field name="meconium"/>
+    </group>
+    <newline/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_gyneco/view/gnuhealth_perinatal_monitor_tree.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<tree string="Perinatal Monitor">
+    <field name="date" expand="1"/>
+    <field name="dilation" expand="1"/>
+    <field name="systolic" expand="1"/>
+    <field name="diastolic" expand="1"/>
+    <field name="frequency" expand="1"/>
+    <field name="fetus_position" expand="1"/>
+    <field name="f_frequency" expand="1"/>
+    <field name="bleeding" expand="1"/>
+    <field name="meconium" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_gyneco/view/gnuhealth_perinatal_tree.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<tree string="Perinatal and Intrapartum Information">
+    <field name="admission_date" expand="1"/>
+    <field name="gestational_weeks" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_gyneco/view/gnuhealth_prenatal_evaluation.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<form string="Prenatal Evaluation">
+    <group id="prenatal_evaluation_group_header" colspan="4" col="4">
+        <label name="evaluation_date"/>
+        <field name="evaluation_date"/>
+        <label name="gestational_weeks"/>
+        <field name="gestational_weeks"/>
+    </group>
+    <group string="Mother Information" id="prenatal_evaluation_group_mother" colspan="4" col="8">
+        <label name="hypertension"/>
+        <field name="hypertension"/>
+        <label name="preeclampsia"/>
+        <field name="preeclampsia"/>
+        <label name="overweight"/>
+        <field name="overweight"/>
+        <label name="diabetes"/>
+        <field name="diabetes"/>
+    </group>
+    <group string="Placenta" id="prenatal_evaluation_group_placenta" colspan="4" col="6">
+        <label name="placenta_previa"/>
+        <field name="placenta_previa"/>
+        <label name="invasive_placentation"/>
+        <field name="invasive_placentation"/>
+        <label name="vasa_previa"/>
+        <field name="vasa_previa"/>
+    </group>
+    <newline/>
+    <group string="Fetus Information" id="prenatal_evaluation_group_fetus" colspan="4" col="8">
+        <label name="fundal_height"/>
+        <field name="fundal_height"/>
+        <label name="fetus_heart_rate"/>
+        <field name="fetus_heart_rate"/>
+        <label name="efw"/>
+        <field name="efw"/>
+        <newline/>
+        <separator colspan="4" string="Fetal Biometry" id="separator_fetal_biometry"/>
+        <newline/>
+        <label name="fetal_bpd"/>
+        <field name="fetal_bpd"/>
+        <label name="fetal_hc"/>
+        <field name="fetal_hc"/>
+        <label name="fetal_ac"/>
+        <field name="fetal_ac"/>
+        <label name="fetal_fl"/>
+        <field name="fetal_fl"/>
+    </group>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_gyneco/view/gnuhealth_prenatal_evaluation_tree.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<tree string="Prenatal Evaluations">
+    <field name="evaluation_date" expand="1"/>
+    <field name="gestational_weeks" expand="1"/>
+    <field name="fundal_height" expand="1"/>
+    <field name="fetus_heart_rate" expand="1"/>
+    <field name="efw" expand="1"/>
+    <field name="iugr" expand="1"/>
+    <field name="hypertension" expand="1"/>
+    <field name="preeclampsia" expand="1"/>
+    <field name="overweight" expand="1"/>
+    <field name="diabetes" expand="1"/>
+    <field name="invasive_placentation" expand="1"/>
+    <field name="placenta_previa" expand="1"/>
+    <field name="vasa_previa" expand="1"/>
+    <field name="oligohydramnios" expand="1"/>
+    <field name="polihydramnios" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_gyneco/view/gnuhealth_puerperium_monitor.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<form string="Puerperium Monitor">
+    <group colspan="4" string="Main" id="group_puerperium_monitor">
+        <label name="date"/>
+        <field name="date"/>
+        <label name="uterus_involution"/>
+        <field name="uterus_involution"/>
+    </group>
+    <newline/>
+    <group colspan="4" string="Lochia" id="group_lochia">
+        <label name="lochia_amount"/>
+        <field name="lochia_amount"/>
+        <label name="lochia_color"/>
+        <field name="lochia_color"/>
+        <label name="lochia_odor"/>
+        <field name="lochia_odor"/>
+        <newline/>
+    </group>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_gyneco/view/gnuhealth_puerperium_monitor_tree.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<tree string="Puerperium Monitor">
+    <field name="date" expand="1"/>
+    <field name="uterus_involution" expand="1"/>
+    <field name="lochia_amount" expand="1"/>
+    <field name="lochia_color" expand="1"/>
+    <field name="lochia_odor" expand="1"/>
+</tree>
--- a/tryton/health_icu/health_icu_view.xml
+++ b/tryton/health_icu/health_icu_view.xml
@@ -18,46 +18,14 @@
         <record model="ir.ui.view" id="gnuhealth_icu_glasgow_form">
             <field name="model">gnuhealth.icu.glasgow</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Patient Glasgow Scores">
-                    <label name="name"/>
-                    <field name="name"/>
-                    <label name="evaluation_date"/>
-                    <field name="evaluation_date"/>
-				
-                    <newline/>
-                    <group id="group_glasgow_header" colspan='4'>
-						<label name="glasgow_eyes"/>
-						<field name="glasgow_eyes"/>
-						<label name="glasgow_verbal"/>
-						<field name="glasgow_verbal"/>
-						<label name="glasgow_motor"/>
-						<field name="glasgow_motor"/>
-						<label name="glasgow"/>
-						<field name="glasgow"/>
-					</group>
-               </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_icu_glasgow_form</field>
         </record>
 
 
       <record model="ir.ui.view" id="gnuhealth_icu_glasgow_tree">
             <field name="model">gnuhealth.icu.glasgow</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string='Glasgow Scores'>
-                    <field name="name" expand="1"/>
-                    <field name="evaluation_date" expand="1"/>
-					<field name="glasgow_eyes" expand="1"/>
-					<field name="glasgow_verbal" expand="1"/>
-					<field name="glasgow_motor" expand="1"/>
-                    <field name="glasgow" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_icu_glasgow_tree</field>
         </record>
                 
 
@@ -103,78 +71,14 @@
         <record model="ir.ui.view" id="gnuhealth_icu_apache2_form">
             <field name="model">gnuhealth.icu.apache2</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="APACHE II Score">
-                    <label name="name"/>
-                    <field name="name"/>
-                    <label name="score_date"/>
-                    <field name="score_date"/>
-					
-                    <label name="age"/>
-                    <field name="age"/>
-                    <newline/>
-                    <group id="group_apache_physisological" string='Physiological' colspan='4'>
-						<label name="temperature"/>
-						<field name="temperature"/>
-						<label name="mean_ap"/>
-						<field name="mean_ap"/>
-						<label name="heart_rate"/>
-						<field name="heart_rate"/>
-						<label name="respiratory_rate"/>
-						<field name="respiratory_rate"/>
-						<label name="fio2"/>
-						<field name="fio2"/>
-						<label name="pao2"/>
-						<field name="pao2"/>
-						<label name="paco2"/>
-						<field name="paco2"/>
-						<label name="aado2"/>
-						<field name="aado2"/>
-						<label name="ph"/>
-						<field name="ph"/>
-						<label name="serum_sodium"/>
-						<field name="serum_sodium"/>
-						<label name="serum_potassium"/>
-						<field name="serum_potassium"/>
-						<label name="serum_creatinine"/>
-						<field name="serum_creatinine"/>
-						<label name="hematocrit"/>
-						<field name="hematocrit"/>
-						<label name="wbc"/>
-						<field name="wbc"/>
-						<label name="arf"/>
-						<field name="arf"/>
-					</group>
-                    <newline/>
-                    <group id="group_apache_chronic" string='Chronic' colspan='4'>
-						<label name="chronic_condition"/>
-						<field name="chronic_condition"/>
-						<label name="hospital_admission_type"/>
-						<field name="hospital_admission_type"/>
-                    </group>
-                    <newline/>
-                    <label name="apache_score"/>
-                    <field name="apache_score"/>
-
-               </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_icu_apache2_form</field>
         </record>
 
 
       <record model="ir.ui.view" id="gnuhealth_icu_apache2_tree">
             <field name="model">gnuhealth.icu.apache2</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string='Apache II Scores'>
-                    <field name="name"/>
-                    <field name="score_date"/>
-                    <field name="apache_score"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_icu_apache2_tree</field>
         </record>
                 
 
@@ -219,48 +123,14 @@
         <record model="ir.ui.view" id="gnuhealth_inpatient_icu_form">
             <field name="model">gnuhealth.inpatient.icu</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Intensive Care Unit">
-                    <label name="name"/>
-                    <field name="name"/>
-                    <label name="admitted"/>
-                    <field name="admitted"/>
-
-                    <newline/>
-                    <group id="icu_group_dates" string="Period" col="8" colspan="4">
-						<label name="icu_admission_date"/>
-						<field name="icu_admission_date"/>
-						<label name="icu_stay"/>
-						<field name="icu_stay"/>
-						<label name="discharged_from_icu"/>
-						<field name="discharged_from_icu"/>
-						<label name="icu_discharge_date"/>
-						<field name="icu_discharge_date"/>
-                    </group>
-					<newline/>
-					<field name="mv_history" colspan="4"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_inpatient_icu_form</field>
         </record>
 
 
         <record model="ir.ui.view" id="gnuhealth_inpatient_icu_tree">
             <field name="model">gnuhealth.inpatient.icu</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string='Intensive Care Unit'>
-                    <field name="name"/>
-                    <field name="admitted" expand="1"/>
-                    <field name="icu_admission_date"/>
-                    <field name="discharged_from_icu"/>
-                    <field name="icu_discharge_date"/>
-					<field name="icu_stay"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_inpatient_icu_tree</field>
         </record>
 
 
@@ -270,50 +140,14 @@
         <record model="ir.ui.view" id="gnuhealth_icu_ventilation_form">
             <field name="model">gnuhealth.icu.ventilation</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Patient Mechanical Ventilation">
-					<group id="group_icu_ventilation" colspan="4" col="8" string="Mechanical Ventilation">
-						<label name="current_mv"/>
-						<field name="current_mv"/>
-						<label name="mv_start"/>
-						<field name="mv_start"/>
-						<label name="mv_end"/>
-						<field name="mv_end"/>
-						<label name="mv_period"/>
-						<field name="mv_period"/>
-						<label name="ventilation"/>
-						<field name="ventilation"/>
-						<label name="ett_size"/>
-						<field name="ett_size"/>
-						<label name="tracheostomy_size"/>
-						<field name="tracheostomy_size"/>
-					</group>
-					<newline/>
-					<label name="remarks"/>
-					<field name="remarks"/>
-					
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_icu_ventilation_form</field>
         </record>
 
 
         <record model="ir.ui.view" id="gnuhealth_icu_ventilation_tree">
             <field name="model">gnuhealth.icu.ventilation</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string='Patient Mechanical Ventilation'>
-					<field name="current_mv"/>
-                    <field name="ventilation"/>
-                    <field name="mv_start"/>
-                    <field name="mv_end"/>
-					<field name="mv_period"/>
-					<field name="remarks" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_icu_ventilation_tree</field>
         </record>
 
 
@@ -324,48 +158,14 @@
         <record model="ir.ui.view" id="gnuhealth_icu_chest_drainage_form">
             <field name="model">gnuhealth.icu.chest_drainage</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Patient Chest Drainage Assesment">
-                    <label name="location"/>
-                    <field name="location"/>
-                    <label name="suction"/>
-                    <field name="suction"/>
-                    <label name="suction_pressure"/>
-                    <field name="suction_pressure"/>
-                    <label name="fluid_volume"/>
-                    <field name="fluid_volume"/>
-                    <label name="fluid_aspect"/>
-                    <field name="fluid_aspect"/>
-                    <label name="oscillation"/>
-                    <field name="oscillation"/>
-                    <label name="air_leak"/>
-                    <field name="air_leak"/>
-                    <label name="remarks"/>
-                    <field name="remarks"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_icu_chest_drainage_form</field>
         </record>
 
 
         <record model="ir.ui.view" id="gnuhealth_icu_chest_drainage_tree">
             <field name="model">gnuhealth.icu.chest_drainage</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree editable="top" string="Patient Chest Drainage Assesment">
-                    <field name="location" expand="1"/>
-                    <field name="suction"/>
-                    <field name="suction_pressure"/>
-                    <field name="fluid_volume"/>
-                    <field name="fluid_aspect"/>
-                    <field name="oscillation"/>
-                    <field name="air_leak"/>
-                    <field name="remarks" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_icu_chest_drainage_tree</field>
         </record>
                 
 
@@ -374,70 +174,14 @@
         <record model="ir.ui.view" id="gnuhealth_icu_ecg_form">
             <field name="model">gnuhealth.icu.ecg</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Patient ECG Assesment">
-                    <label name="name"/>
-                    <field name="name"/>
-                    <label name="lead"/>
-                    <field name="lead"/>
-                    <label name="axis"/>
-                    <field name="axis"/>
-                    <label name="rate"/>
-                    <field name="rate"/>
-                    <label name="pacemaker"/>
-                    <field name="pacemaker"/>
-                    <label name="rhythm"/>
-                    <field name="rhythm"/>
-                    <newline/>
-                    <group id="ecg_intervals" colspan="4" col="6">
-                        <label name="pr"/>
-                        <field name="pr"/>
-                        <label name="qrs"/>
-                        <field name="qrs"/>
-                        <label name="qt"/>
-                        <field name="qt"/>
-                    </group>
-                    <newline/>
-                    <label name="st_segment"/>
-                    <field name="st_segment"/>
-                    <label name="twave_inversion"/>
-                    <field name="twave_inversion"/>
-                    <newline/>
-                    <label name="interpretation"/>
-                    <field name="interpretation" colspan="3"/>
-                    <newline/>
-                    
-                    <field colspan="4" name="ecg_strip" widget="image"/>
-
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_icu_ecg_form</field>
         </record>
 
 
         <record model="ir.ui.view" id="gnuhealth_icu_ecg_tree">
             <field name="model">gnuhealth.icu.ecg</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree editable="top" string="Patient ECG Assesment">
-                    <field name="ecg_date"/>
-                    <field name="name"/>
-                    <field name="lead"/>
-                    <field name="axis"/>
-                    <field name="rhythm"/>
-                    <field name="pacemaker"/>
-                    <field name="rate"/>
-                    <field name="pr"/>
-                    <field name="qrs"/>
-                    <field name="qt"/>
-                    <field name="st_segment"/>
-                    <field name="twave_inversion"/>
-                    <field name="interpretation" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_icu_ecg_tree</field>
         </record>
                 
 
@@ -484,149 +228,7 @@
             <field name="model">gnuhealth.patient.rounding</field>
             <field name="inherit" ref="health_nursing.gnuhealth_patient_rounding_view" />
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-
-                    <xpath
-                        expr="/form/notebook/page/group/label[@name='warning']"
-                        position="replace">
-                    </xpath>
-
-                    <xpath
-                        expr="/form/notebook/page/group/field[@name='warning']"
-                        position="replace">
-                    </xpath>
-
-                    <xpath
-                        expr="/form/notebook/page/group/field[@name='environmental_assessment']"
-                        position="after">
-                        <group colspan="1" col="4" id="group_rounding_icu_warning">
-							<label name="icu_patient"/>
-							<field name="icu_patient"/>
-							<label name="warning"/>
-							<field name="warning"/>
-						</group>
-                    </xpath>
-
-                    <xpath
-                        expr="/form/notebook/page[@id='rounding_main']"
-                        position="after">
-
-                        <page id='rounding_icu' string='ICU'>
-							<group id="group_rounding_icu_neurologic" colspan="4" col="8" string="Neurologic">
-								<label name="gcs"/>
-								<field name="gcs"/>
-								<newline/>
-								<label name="pupil_dilation"/>
-								<field name="pupil_dilation"/>
-								<label name="right_pupil"/>
-								<field name="right_pupil"/>
-								<label name="left_pupil"/>
-								<field name="left_pupil"/>
-								<label name="anisocoria"/>
-								<field name="anisocoria"/>
-
-								<newline/>
-								<label name="pupillary_reactivity"/>
-								<field name="pupillary_reactivity"/>
-								<label name="pupil_consensual_resp"/>
-								<field name="pupil_consensual_resp"/>
-
-							</group>
-
-                            <newline/>    
-
-							<group colspan="4" id="group_rounding_icu_respiratory" string="Respiratory">
-                                <group id="chest_icu_main">
-                                    <label name="oxygen_mask"/>
-                                    <field name="oxygen_mask"/>
-                                    <label name="fio2"/>
-                                    <field name="fio2"/>
-                                    <label name="respiration_type"/>
-                                    <field name="respiration_type"/>
-                                    <label name="trachea_alignment"/>
-                                    <field name="trachea_alignment"/>
-                                    <newline/>
-                                    <label name="peep"/>
-                                    <field name="peep"/>
-                                    <label name="peep_pressure"/>
-                                    <field name="peep_pressure"/>
-                                    <label name="sce"/>
-                                    <field name="sce"/>
-                                    <label name="oral_mucosa_lesion"/>
-                                    <field name="oral_mucosa_lesion"/>
-                                    <label name="lips_lesion"/>
-                                    <field name="lips_lesion"/>
-                                    <newline/>
-                                    <group id="chest_expansion" string="Chest Expansion" colspan="4" col="6">
-                                        <label name="chest_expansion"/>
-                                        <field name="chest_expansion"/>
-                                        <label name="paradoxical_expansion"/>
-                                        <field name="paradoxical_expansion"/>
-                                        <label name="tracheal_tug"/>
-                                        <field name="tracheal_tug"/>
-                                    </group>
-                                </group>
-                                <group string="Xray" id="patient_xray">
-                                    <field name="xray" img_width="200" img_height="200"
-                                        height="200" width="200" widget="image"/>
-                                </group>
-                                <newline/>    
-							</group>
-                            <field name="chest_drainages" colspan="4"/>
-                            <newline/>
-							<group colspan="4" id="group_rounding_icu_cardio" string="Cardiovascular">
-                                <group id="icu_cardio_ecg" colspan="4" col="4">
-                                    <label name="ecg"/>
-                                    <field name="ecg" colspan="3"/>
-                                </group>
-                                <newline/>
-                                <group id="icu_vessel_access" colspan="4" col="10">
-                                    <label name="venous_access"/>
-                                    <field name="venous_access"/>
-                                    <label name="swan_ganz"/>
-                                    <field name="swan_ganz"/>
-                                    <label name="arterial_access"/>
-                                    <field name="arterial_access"/>
-                                    <label name="dialysis"/>
-                                    <field name="dialysis"/>
-                                    <label name="edema"/>
-                                    <field name="edema"/>
-                                </group>
-
-                            </group>
-
-                            <group id="icu_skin" string="Blood and Skin" colspan="4" col="10">
-                                <label name="bacteremia"/>
-                                <field name="bacteremia"/>
-                                <label name="ssi"/>
-                                <field name="ssi"/>
-                                <label name="wound_dehiscence"/>
-                                <field name="wound_dehiscence"/>
-                                <label name="cellulitis"/>
-                                <field name="cellulitis"/>
-                                <label name="necrotizing_fasciitis"/>
-                                <field name="necrotizing_fasciitis"/>
-                            </group>
-
-                            <group id="digestive" string="Digestive and Abdomen" colspan="4" col="10">
-                                <label name="vomiting"/>
-                                <field name="vomiting"/>
-                                <label name="bowel_sounds"/>
-                                <field name="bowel_sounds"/>
-                                <label name="stools"/>
-                                <field name="stools"/>
-                                <label name="peritonitis"/>
-                                <field name="peritonitis"/>
-                            </group>
- 
-                        </page>
-
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_patient_icu_rounding</field>
         </record>
 
 
--- a/tryton/health_icu/setup.py
+++ b/tryton/health_icu/setup.py
@@ -60,7 +60,8 @@
     package_data={
         'trytond.modules.health_icu': info.get('xml', []) \
             + info.get('translation', []) \
-            + ['tryton.cfg', 'doc/*.rst', 'locale/*.po', 'report/*.odt', 'icons/*.svg'],
+            + ['tryton.cfg', 'view/*.xml', 'doc/*.rst', 'locale/*.po',
+               'report/*.odt', 'icons/*.svg'],
         },
 
     classifiers=[
new file mode 100644
--- /dev/null
+++ b/tryton/health_icu/view/gnuhealth_icu_apache2_form.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+<form string="APACHE II Score">
+    <label name="name"/>
+    <field name="name"/>
+    <label name="score_date"/>
+    <field name="score_date"/>
+    <label name="age"/>
+    <field name="age"/>
+    <newline/>
+    <group id="group_apache_physisological" string="Physiological" colspan="4">
+        <label name="temperature"/>
+        <field name="temperature"/>
+        <label name="mean_ap"/>
+        <field name="mean_ap"/>
+        <label name="heart_rate"/>
+        <field name="heart_rate"/>
+        <label name="respiratory_rate"/>
+        <field name="respiratory_rate"/>
+        <label name="fio2"/>
+        <field name="fio2"/>
+        <label name="pao2"/>
+        <field name="pao2"/>
+        <label name="paco2"/>
+        <field name="paco2"/>
+        <label name="aado2"/>
+        <field name="aado2"/>
+        <label name="ph"/>
+        <field name="ph"/>
+        <label name="serum_sodium"/>
+        <field name="serum_sodium"/>
+        <label name="serum_potassium"/>
+        <field name="serum_potassium"/>
+        <label name="serum_creatinine"/>
+        <field name="serum_creatinine"/>
+        <label name="hematocrit"/>
+        <field name="hematocrit"/>
+        <label name="wbc"/>
+        <field name="wbc"/>
+        <label name="arf"/>
+        <field name="arf"/>
+    </group>
+    <newline/>
+    <group id="group_apache_chronic" string="Chronic" colspan="4">
+        <label name="chronic_condition"/>
+        <field name="chronic_condition"/>
+        <label name="hospital_admission_type"/>
+        <field name="hospital_admission_type"/>
+    </group>
+    <newline/>
+    <label name="apache_score"/>
+    <field name="apache_score"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_icu/view/gnuhealth_icu_apache2_tree.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<tree string="Apache II Scores">
+    <field name="name"/>
+    <field name="score_date"/>
+    <field name="apache_score"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_icu/view/gnuhealth_icu_chest_drainage_form.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<form string="Patient Chest Drainage Assesment">
+    <label name="location"/>
+    <field name="location"/>
+    <label name="suction"/>
+    <field name="suction"/>
+    <label name="suction_pressure"/>
+    <field name="suction_pressure"/>
+    <label name="fluid_volume"/>
+    <field name="fluid_volume"/>
+    <label name="fluid_aspect"/>
+    <field name="fluid_aspect"/>
+    <label name="oscillation"/>
+    <field name="oscillation"/>
+    <label name="air_leak"/>
+    <field name="air_leak"/>
+    <label name="remarks"/>
+    <field name="remarks"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_icu/view/gnuhealth_icu_chest_drainage_tree.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<tree editable="top" string="Patient Chest Drainage Assesment">
+    <field name="location" expand="1"/>
+    <field name="suction"/>
+    <field name="suction_pressure"/>
+    <field name="fluid_volume"/>
+    <field name="fluid_aspect"/>
+    <field name="oscillation"/>
+    <field name="air_leak"/>
+    <field name="remarks" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_icu/view/gnuhealth_icu_ecg_form.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<form string="Patient ECG Assesment">
+    <label name="name"/>
+    <field name="name"/>
+    <label name="lead"/>
+    <field name="lead"/>
+    <label name="axis"/>
+    <field name="axis"/>
+    <label name="rate"/>
+    <field name="rate"/>
+    <label name="pacemaker"/>
+    <field name="pacemaker"/>
+    <label name="rhythm"/>
+    <field name="rhythm"/>
+    <newline/>
+    <group id="ecg_intervals" colspan="4" col="6">
+        <label name="pr"/>
+        <field name="pr"/>
+        <label name="qrs"/>
+        <field name="qrs"/>
+        <label name="qt"/>
+        <field name="qt"/>
+    </group>
+    <newline/>
+    <label name="st_segment"/>
+    <field name="st_segment"/>
+    <label name="twave_inversion"/>
+    <field name="twave_inversion"/>
+    <newline/>
+    <label name="interpretation"/>
+    <field name="interpretation" colspan="3"/>
+    <newline/>
+    <field colspan="4" name="ecg_strip" widget="image"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_icu/view/gnuhealth_icu_ecg_tree.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<tree editable="top" string="Patient ECG Assesment">
+    <field name="ecg_date"/>
+    <field name="name"/>
+    <field name="lead"/>
+    <field name="axis"/>
+    <field name="rhythm"/>
+    <field name="pacemaker"/>
+    <field name="rate"/>
+    <field name="pr"/>
+    <field name="qrs"/>
+    <field name="qt"/>
+    <field name="st_segment"/>
+    <field name="twave_inversion"/>
+    <field name="interpretation" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_icu/view/gnuhealth_icu_glasgow_form.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<form string="Patient Glasgow Scores">
+    <label name="name"/>
+    <field name="name"/>
+    <label name="evaluation_date"/>
+    <field name="evaluation_date"/>
+    <newline/>
+    <group id="group_glasgow_header" colspan="4">
+        <label name="glasgow_eyes"/>
+        <field name="glasgow_eyes"/>
+        <label name="glasgow_verbal"/>
+        <field name="glasgow_verbal"/>
+        <label name="glasgow_motor"/>
+        <field name="glasgow_motor"/>
+        <label name="glasgow"/>
+        <field name="glasgow"/>
+    </group>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_icu/view/gnuhealth_icu_glasgow_tree.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<tree string="Glasgow Scores">
+    <field name="name" expand="1"/>
+    <field name="evaluation_date" expand="1"/>
+    <field name="glasgow_eyes" expand="1"/>
+    <field name="glasgow_verbal" expand="1"/>
+    <field name="glasgow_motor" expand="1"/>
+    <field name="glasgow" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_icu/view/gnuhealth_icu_ventilation_form.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<form string="Patient Mechanical Ventilation">
+    <group id="group_icu_ventilation" colspan="4" col="8" string="Mechanical Ventilation">
+        <label name="current_mv"/>
+        <field name="current_mv"/>
+        <label name="mv_start"/>
+        <field name="mv_start"/>
+        <label name="mv_end"/>
+        <field name="mv_end"/>
+        <label name="mv_period"/>
+        <field name="mv_period"/>
+        <label name="ventilation"/>
+        <field name="ventilation"/>
+        <label name="ett_size"/>
+        <field name="ett_size"/>
+        <label name="tracheostomy_size"/>
+        <field name="tracheostomy_size"/>
+    </group>
+    <newline/>
+    <label name="remarks"/>
+    <field name="remarks"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_icu/view/gnuhealth_icu_ventilation_tree.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<tree string="Patient Mechanical Ventilation">
+    <field name="current_mv"/>
+    <field name="ventilation"/>
+    <field name="mv_start"/>
+    <field name="mv_end"/>
+    <field name="mv_period"/>
+    <field name="remarks" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_icu/view/gnuhealth_inpatient_icu_form.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<form string="Intensive Care Unit">
+    <label name="name"/>
+    <field name="name"/>
+    <label name="admitted"/>
+    <field name="admitted"/>
+    <newline/>
+    <group id="icu_group_dates" string="Period" col="8" colspan="4">
+        <label name="icu_admission_date"/>
+        <field name="icu_admission_date"/>
+        <label name="icu_stay"/>
+        <field name="icu_stay"/>
+        <label name="discharged_from_icu"/>
+        <field name="discharged_from_icu"/>
+        <label name="icu_discharge_date"/>
+        <field name="icu_discharge_date"/>
+    </group>
+    <newline/>
+    <field name="mv_history" colspan="4"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_icu/view/gnuhealth_inpatient_icu_tree.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<tree string="Intensive Care Unit">
+    <field name="name"/>
+    <field name="admitted" expand="1"/>
+    <field name="icu_admission_date"/>
+    <field name="discharged_from_icu"/>
+    <field name="icu_discharge_date"/>
+    <field name="icu_stay"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_icu/view/gnuhealth_patient_icu_rounding.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0"?>
+<data>
+    <xpath expr="/form/notebook/page/group/label[@name='warning']" position="replace"/>
+    <xpath expr="/form/notebook/page/group/field[@name='warning']" position="replace"/>
+    <xpath expr="/form/notebook/page/group/field[@name='environmental_assessment']" position="after">
+        <group colspan="1" col="4" id="group_rounding_icu_warning">
+            <label name="icu_patient"/>
+            <field name="icu_patient"/>
+            <label name="warning"/>
+            <field name="warning"/>
+        </group>
+    </xpath>
+    <xpath expr="/form/notebook/page[@id='rounding_main']" position="after">
+        <page id="rounding_icu" string="ICU">
+            <group id="group_rounding_icu_neurologic" colspan="4" col="8" string="Neurologic">
+                <label name="gcs"/>
+                <field name="gcs"/>
+                <newline/>
+                <label name="pupil_dilation"/>
+                <field name="pupil_dilation"/>
+                <label name="right_pupil"/>
+                <field name="right_pupil"/>
+                <label name="left_pupil"/>
+                <field name="left_pupil"/>
+                <label name="anisocoria"/>
+                <field name="anisocoria"/>
+                <newline/>
+                <label name="pupillary_reactivity"/>
+                <field name="pupillary_reactivity"/>
+                <label name="pupil_consensual_resp"/>
+                <field name="pupil_consensual_resp"/>
+            </group>
+            <newline/>
+            <group colspan="4" id="group_rounding_icu_respiratory" string="Respiratory">
+                <group id="chest_icu_main">
+                    <label name="oxygen_mask"/>
+                    <field name="oxygen_mask"/>
+                    <label name="fio2"/>
+                    <field name="fio2"/>
+                    <label name="respiration_type"/>
+                    <field name="respiration_type"/>
+                    <label name="trachea_alignment"/>
+                    <field name="trachea_alignment"/>
+                    <newline/>
+                    <label name="peep"/>
+                    <field name="peep"/>
+                    <label name="peep_pressure"/>
+                    <field name="peep_pressure"/>
+                    <label name="sce"/>
+                    <field name="sce"/>
+                    <label name="oral_mucosa_lesion"/>
+                    <field name="oral_mucosa_lesion"/>
+                    <label name="lips_lesion"/>
+                    <field name="lips_lesion"/>
+                    <newline/>
+                    <group id="chest_expansion" string="Chest Expansion" colspan="4" col="6">
+                        <label name="chest_expansion"/>
+                        <field name="chest_expansion"/>
+                        <label name="paradoxical_expansion"/>
+                        <field name="paradoxical_expansion"/>
+                        <label name="tracheal_tug"/>
+                        <field name="tracheal_tug"/>
+                    </group>
+                </group>
+                <group string="Xray" id="patient_xray">
+                    <field name="xray" img_width="200" img_height="200" height="200" width="200" widget="image"/>
+                </group>
+                <newline/>
+            </group>
+            <field name="chest_drainages" colspan="4"/>
+            <newline/>
+            <group colspan="4" id="group_rounding_icu_cardio" string="Cardiovascular">
+                <group id="icu_cardio_ecg" colspan="4" col="4">
+                    <label name="ecg"/>
+                    <field name="ecg" colspan="3"/>
+                </group>
+                <newline/>
+                <group id="icu_vessel_access" colspan="4" col="10">
+                    <label name="venous_access"/>
+                    <field name="venous_access"/>
+                    <label name="swan_ganz"/>
+                    <field name="swan_ganz"/>
+                    <label name="arterial_access"/>
+                    <field name="arterial_access"/>
+                    <label name="dialysis"/>
+                    <field name="dialysis"/>
+                    <label name="edema"/>
+                    <field name="edema"/>
+                </group>
+            </group>
+            <group id="icu_skin" string="Blood and Skin" colspan="4" col="10">
+                <label name="bacteremia"/>
+                <field name="bacteremia"/>
+                <label name="ssi"/>
+                <field name="ssi"/>
+                <label name="wound_dehiscence"/>
+                <field name="wound_dehiscence"/>
+                <label name="cellulitis"/>
+                <field name="cellulitis"/>
+                <label name="necrotizing_fasciitis"/>
+                <field name="necrotizing_fasciitis"/>
+            </group>
+            <group id="digestive" string="Digestive and Abdomen" colspan="4" col="10">
+                <label name="vomiting"/>
+                <field name="vomiting"/>
+                <label name="bowel_sounds"/>
+                <field name="bowel_sounds"/>
+                <label name="stools"/>
+                <field name="stools"/>
+                <label name="peritonitis"/>
+                <field name="peritonitis"/>
+            </group>
+        </page>
+    </xpath>
+</data>
--- a/tryton/health_imaging/health_imaging_view.xml
+++ b/tryton/health_imaging/health_imaging_view.xml
@@ -18,29 +18,13 @@
         <record model="ir.ui.view" id="view_imaging_test_type_form">
             <field name="model">gnuhealth.imaging.test.type</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <form string="Imaging Test Type">
-                        <label name="code"/>
-                        <field name="code"/>
-                        <label name="name"/>
-                        <field name="name"/>
-                    </form>
-                ]]>
-            </field>
+            <field name="name">imaging_test_type_form</field>
         </record>
 
         <record model="ir.ui.view" id="view_imaging_test_type_tree">
             <field name="model">gnuhealth.imaging.test.type</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <tree string="Imaging Test Type">
-                        <field name="code"/>
-                        <field name="name"/>
-                    </tree>
-                ]]>
-            </field>
+            <field name="name">imaging_test_type_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="act_imaging_test_type_view">
@@ -55,34 +39,13 @@
         <record model="ir.ui.view" id="view_imaging_test_form">
             <field name="model">gnuhealth.imaging.test</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <form string="Imaging Test">
-                        <label name="code"/>
-                        <field name="code"/>
-                        <label name="name"/>
-                        <field name="name"/>
-                        <label name="test_type"/>
-                        <field name="test_type"/>
-                        <label name="product"/>
-                        <field name="product"/>
-                    </form>
-                ]]>
-            </field>
+            <field name="name">imaging_test_form</field>
         </record>
 
         <record model="ir.ui.view" id="view_imaging_test_tree">
             <field name="model">gnuhealth.imaging.test</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <tree string="Imaging Test">
-                        <field name="code"/>
-                        <field name="name"/>
-                        <field name="test_type"/>
-                    </tree>
-                ]]>
-            </field>
+            <field name="name">imaging_test_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="act_imaging_test_view">
@@ -108,53 +71,12 @@
        <record model="ir.ui.view" id="view_imaging_test_request_form">
            <field name="model">gnuhealth.imaging.test.request</field>
            <field name="type">form</field>
-           <field name="arch" type="xml">
-               <![CDATA[
-                   <form string="Imaging Test Request">
-                       <label name="request"/>
-                       <field name="request"/>
-                       <label name="urgent"/>
-                       <field name="urgent"/>
-                       <label name="patient"/>
-                       <field name="patient"/>
-                       <label name="date"/>
-                       <field name="date"/>
-                       <label name="requested_test"/>
-                       <field name="requested_test"/>
-                       <label name="doctor"/>
-                       <field name="doctor"/>
-                       <group col="5" colspan="4" id="imaging_request_buttons">
-                           <label name="state"/>
-                           <field name="state"/>
-                           <button name="requested" string="Request"
-                               icon="tryton-go-next"/>
-                            <button name="generate_results" colspan="2"
-                                string="Generate Results"
-                                icon="tryton-go-next"/>
-                        </group>
-                        <label name="comment"/>
-                        <newline/>
-                        <field name="comment" colspan="4"/>
-                   </form>
-               ]]>
-           </field>
+           <field name="name">imaging_test_request_form</field>
         </record>
         <record model="ir.ui.view" id="view_imaging_test_request_tree">
            <field name="model">gnuhealth.imaging.test.request</field>
            <field name="type">tree</field>
-           <field name="arch" type="xml">
-               <![CDATA[
-                   <tree string="Imaging Test Request">
-                       <field name="request"/>
-                       <field name="patient" expand="1"/>
-                       <field name="date"/>
-                       <field name="requested_test" expand="1"/>
-                       <field name="doctor"/>
-                       <field name="state"/>
-                       <field name="urgent"/>
-                   </tree>
-                ]]>
-           </field>
+           <field name="name">imaging_test_request_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="act_imaging_test_request_view">
@@ -209,53 +131,13 @@
         <record model="ir.ui.view" id="view_imaging_test_result_form">
             <field name="model">gnuhealth.imaging.test.result</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <form string="Imaging Test Result">
-                        <label name="patient"/>
-                        <field name="patient"/>
-                        <label name="number"/>
-                        <field name="number"/>
-                        <label name="date"/>
-                        <field name="date"/>
-                        <label name="result_file"/>
-                        <field name="result_file"/>
-                        <label name="requested_test"/>
-                        <field name="requested_test"/>
-                        <label name="request_date"/>
-                        <field name="request_date"/>
-                        <label name="doctor"/>
-                        <field name="doctor"/>
-                        <label name="request"/>
-                        <field name="request"/>
-                        <notebook>
-                            <page string="Images" id="images_page">
-                                <field name="images" colspan="4"/>
-                            </page>
-                            <page string="Comment" id="comment_page">
-                                <field name="comment" colspan="4"/>
-                            </page>
-                        </notebook>
-                    </form>
-                ]]>
-            </field>
+            <field name="name">imaging_test_result_form</field>
         </record>
 
         <record model="ir.ui.view" id="view_imaging_test_result_tree">
             <field name="model">gnuhealth.imaging.test.result</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <tree string="Imaging Test Result">
-                        <field name="patient"/>
-                        <field name="number"/>
-                        <field name="date"/>
-                        <field name="requested_test"/>
-                        <field name="request_date"/>
-                        <field name="doctor"/>
-                    </tree>
-                ]]>
-            </field>
+            <field name="name">imaging_test_result_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="act_imaging_test_result_view">
@@ -294,22 +176,7 @@
         <record model="ir.ui.view" id="patient_imaging_test_request_start_view_form">
             <field name="model">gnuhealth.patient.imaging.test.request.start</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Request Imaging Test">
-                    <label name="date"/>
-                    <field name="date"/>
-                    <label name="urgent"/>
-                    <field name="urgent"/>
-                    <label name="patient"/>
-                    <field name="patient"/>
-                    <label name="doctor"/>
-                    <field name="doctor" widget="selection"/>
-                    <newline/>
-                    <field name="tests" colspan="4"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">patient_imaging_test_request_start_form</field>
         </record>
         <record model="ir.action.wizard" id="patient_imaging_test_request">
             <field name="name">Request Imaging Test</field>
--- a/tryton/health_imaging/setup.py
+++ b/tryton/health_imaging/setup.py
@@ -60,7 +60,8 @@
     package_data={
         'trytond.modules.health_imaging': info.get('xml', []) \
             + info.get('translation', []) \
-            + ['tryton.cfg', 'doc/*.rst', 'locale/*.po', 'report/*.odt', 'icons/*.svg'],
+            + ['tryton.cfg', 'view/*.xml', 'doc/*.rst', 'locale/*.po',
+               'report/*.odt', 'icons/*.svg'],
         },
 
     classifiers=[
new file mode 100644
--- /dev/null
+++ b/tryton/health_imaging/view/imaging_test_form.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<form string="Imaging Test">
+    <label name="code"/>
+    <field name="code"/>
+    <label name="name"/>
+    <field name="name"/>
+    <label name="test_type"/>
+    <field name="test_type"/>
+    <label name="product"/>
+    <field name="product"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_imaging/view/imaging_test_request_form.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<form string="Imaging Test Request">
+    <label name="request"/>
+    <field name="request"/>
+    <label name="urgent"/>
+    <field name="urgent"/>
+    <label name="patient"/>
+    <field name="patient"/>
+    <label name="date"/>
+    <field name="date"/>
+    <label name="requested_test"/>
+    <field name="requested_test"/>
+    <label name="doctor"/>
+    <field name="doctor"/>
+    <group col="5" colspan="4" id="imaging_request_buttons">
+        <label name="state"/>
+        <field name="state"/>
+        <button name="requested" string="Request" icon="tryton-go-next"/>
+        <button name="generate_results" colspan="2" string="Generate Results" icon="tryton-go-next"/>
+    </group>
+    <label name="comment"/>
+    <newline/>
+    <field name="comment" colspan="4"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_imaging/view/imaging_test_request_tree.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<tree string="Imaging Test Request">
+    <field name="request"/>
+    <field name="patient" expand="1"/>
+    <field name="date"/>
+    <field name="requested_test" expand="1"/>
+    <field name="doctor"/>
+    <field name="state"/>
+    <field name="urgent"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_imaging/view/imaging_test_result_form.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<form string="Imaging Test Result">
+    <label name="patient"/>
+    <field name="patient"/>
+    <label name="number"/>
+    <field name="number"/>
+    <label name="date"/>
+    <field name="date"/>
+    <label name="result_file"/>
+    <field name="result_file"/>
+    <label name="requested_test"/>
+    <field name="requested_test"/>
+    <label name="request_date"/>
+    <field name="request_date"/>
+    <label name="doctor"/>
+    <field name="doctor"/>
+    <label name="request"/>
+    <field name="request"/>
+    <notebook>
+        <page string="Images" id="images_page">
+            <field name="images" colspan="4"/>
+        </page>
+        <page string="Comment" id="comment_page">
+            <field name="comment" colspan="4"/>
+        </page>
+    </notebook>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_imaging/view/imaging_test_result_tree.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<tree string="Imaging Test Result">
+    <field name="patient"/>
+    <field name="number"/>
+    <field name="date"/>
+    <field name="requested_test"/>
+    <field name="request_date"/>
+    <field name="doctor"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_imaging/view/imaging_test_tree.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<tree string="Imaging Test">
+    <field name="code"/>
+    <field name="name"/>
+    <field name="test_type"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_imaging/view/imaging_test_type_form.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<form string="Imaging Test Type">
+    <label name="code"/>
+    <field name="code"/>
+    <label name="name"/>
+    <field name="name"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_imaging/view/imaging_test_type_tree.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<tree string="Imaging Test Type">
+    <field name="code"/>
+    <field name="name"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_imaging/view/patient_imaging_test_request_start_form.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<form string="Request Imaging Test">
+    <label name="date"/>
+    <field name="date"/>
+    <label name="urgent"/>
+    <field name="urgent"/>
+    <label name="patient"/>
+    <field name="patient"/>
+    <label name="doctor"/>
+    <field name="doctor" widget="selection"/>
+    <newline/>
+    <field name="tests" colspan="4"/>
+</form>
--- a/tryton/health_inpatient/health_inpatient_view.xml
+++ b/tryton/health_inpatient/health_inpatient_view.xml
@@ -39,112 +39,13 @@
         <record model="ir.ui.view" id="gnuhealth_inpatient_registration_view">
             <field name="model">gnuhealth.inpatient.registration</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Inpatient Registration Information">
-                    <notebook>
-                        <page string="Administrative data" id="page_admin_data">
-                            <group colspan="4" id="group_admin_data_holder1">
-                                <group colspan="2" id="group_admin_data">
-                                    <label name="name"/>
-                                    <field name="name"/>
-                                    <label name="patient"/>
-                                    <field name="patient"/>
-                                </group>
-                                <group colspan="2" id="group_admin_bed">
-                                    <label name="bed"/>
-                                    <field name="bed"/>
-                                </group>
-                                <newline/>
-
-                                <group colspan="4" id="group_admin_data_holder2">
-                                    <label name="hospitalization_date"/>
-                                    <field name="hospitalization_date"/>
-                                    <label name="discharge_date"/>
-                                    <field name="discharge_date"/>
-                                    <label name="attending_physician"/>
-                                    <field name="attending_physician"/>
-                                    <label name="operating_physician"/>
-                                    <field name="operating_physician"/>
-                                </group>
-                                <group colspan="4" id="group_admin_data_holder3">
-                                    <label name="admission_type"/>
-                                    <field name="admission_type"/>
-                                    <label name="admission_reason"/>
-                                    <field name="admission_reason"/>
-                                    <newline/>
-                                    <label name="info" colspan="4"/>
-                                    <field name="info" colspan="4"/>
-                                </group>
-                            </group>
-                            <newline/>
-                            <field name="bed_transfers"/>
-                            <newline/>
-                            <group colspan="4" id="group_registration_holder1">
-                                <group colspan="2" id="group_registration_holder2">
-                                    <field name="state" readonly="1"/>
-                                    <button name="confirmed" string="Confirm" help="Confirm Registration / Make the reservation" icon="icon-ok"/>
-
-                                </group>
-
-                                <group colspan="2" id="group_registration_holder3">
-                                    <button name="cancel" help="Cancel Registration" string="Cancel" icon="icon-cancel" confirm="Cancel the patient registration process ?"/>
-                                    <button name="admission" help="Patient Admission" string="Admission" icon="icon-ok" confirm="Admit the patient in the health institution and assign the bed"/>
-                                    <button name="discharge" help="Discharge Patient" string="Discharge" icon="icon-home" confirm="You are about to discharge the patient from the health institution."/>
-
-                                </group>
-
-                            </group>
-
-                        </page>
-                        <page string="Nutrition" id="page_inpatient_nutrition">
-                            <label name="diet_belief"/>
-                            <field name="diet_belief"/>
-                            <label name="diet_vegetarian"/>
-                            <field name="diet_vegetarian"/>
-                            <newline/>
-                            <field colspan="4" name="therapeutic_diets"/>
-                            <newline/>
-                            <separator colspan="4" id="separator_nutrition_notes" string="Other nutrition notes / directions"/>
-                            <newline/>
-                            <field colspan="4" name="nutrition_notes"/>
-
-                        </page>
-
-                        <page string="Medication" id="page_inpatient_medication">
-                            <field name="medications"/>
-                        </page>
-
-                        <page string="Care Plan" id="page_care_plan">
-                            <label name="nursing_plan"/>
-                            <field name="nursing_plan"/>
-                            <newline/>
-                            <label name="discharge_plan"/>
-                            <field name="discharge_plan"/>
-                        </page>
-                    </notebook>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_inpatient_registration</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_inpatient_registration_tree">
             <field name="model">gnuhealth.inpatient.registration</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Inpatient Registration Info"
-                 colors="If(And(Equal(Eval('state'), 'hospitalized'), Equal(Eval('admission_type'), 'elective' )), 'blue',If(Equal(Eval('admission_type'), 'emergency'), 'red', If(Equal(Eval('admission_type'), 'maternity'), 'blue','black')))">
-                    <field name="name" expand="1"/>
-                    <field name="patient" expand="1"/>
-                    <field name="hospitalization_date" expand="1"/>
-                    <field name="discharge_date" expand="1"/>
-                    <field name="bed" expand="1"/>
-                    <field name="admission_type" expand="1"/>
-                    <field name="state" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_inpatient_registration_tree</field>
         </record>
 
 <!-- Create the Action -->
@@ -177,20 +78,7 @@
             <field name="model">gnuhealth.appointment</field>
             <field name="inherit" ref="health.gnuhealth_appointment_form" />
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/form/group/field[@name=&quot;institution&quot;]"
-                        position="after">
-
-                        <label name="inpatient_registration_code"/>
-                        <field name="inpatient_registration_code"/>
-
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">partner_form</field>
         </record>
 
 <!-- Add the patient Hospitalization Status to the partner form -->
@@ -198,17 +86,7 @@
         <record id="view_patient_form" model="ir.ui.view">
             <field name="model">gnuhealth.patient</field>
             <field name="inherit" ref="health.gnuhealth_patient_view_form"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="//field[@name=&quot;rh&quot;]"
-                        position="after">
-                        <field name="patient_status"/>
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">patient_form</field>
         </record>
 
 <!-- Add the patient Hospitalization Status to the tree -->
@@ -216,19 +94,7 @@
         <record id="gnuhealth_patient_extd_tree" model="ir.ui.view">
             <field name="model">gnuhealth.patient</field>
             <field name="inherit" ref="health.gnuhealth_patient_tree"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/tree/field[@name=&quot;identification_code&quot;]"
-                        position="after">
-
-                        <field name="patient_status"/>
-
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_patient_extd_tree</field>
         </record>
 
 <!-- Inpatient Medication -->
@@ -237,99 +103,14 @@
         <record model="ir.ui.view" id="gnuhealth_inpatient_medication_form">
             <field name="model">gnuhealth.inpatient.medication</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Inpatient Medication">
-                    <notebook>
-
-                        <page string="General Info" id="inpatient_medication_general_info">
-                            <group id="inpatient_medication_header" string="Medication">
-                                <label name="medicament"/>
-                                <field name="medicament"/>
-                                <label name="indication"/>
-                                <field name="indication"/>
-                            </group>
-                            <newline/>
-                            <newline/>
-                            <group id="inpatient_treatment_period"
-                                string="Treatment period">
-                                <label name="start_treatment"/>
-                                <field name="start_treatment"/>
-                                <label name="end_treatment"/>
-                                <field name="end_treatment"/>
-                            </group>
-                            <newline/>
-                            <group id="inpatient_medicament_form"
-                                string="Admnistration">
-                                <label name="form"/>
-                                <field name="form"/>
-                                <label name="route"/>
-                                <field name="route"/>
-                            </group>
-                            <newline/>
-                            <group id="inpatient_medicament_dosage" colspan="4" col="8"
-                                string="Dosage">
-                                <label name="dose"/>
-                                <field name="dose"/>
-                                <label name="dose_unit"/>
-                                <field name="dose_unit"/>
-                                <label name="qty"/>
-                                <field name="qty"/>
-                                <label name="common_dosage"/>
-                                <field name="common_dosage"/>
-                            </group>
-                            <newline/>
-                            <field colspan="4" name="admin_times"/>
-
-                            <newline/>
-                        </page>
-
-                        <page id="inpatient_medication_misc" string="Extra Info">
-
-                            <group id="inpatient_treatment_status" string="Status">
-                                <label name="is_active"/>
-                                <field name="is_active"/>
-                                <label name="course_completed"/>
-                                <field name="course_completed"/>
-                                <label name="discontinued"/>
-                                <field name="discontinued"/>
-                                <label name="discontinued_reason"/>
-                                <field name="discontinued_reason"/>
-                            </group>
-                            <newline/>
-                            <group id="inpatient_medication_adeverse_effects"
-                                string="Adverse Reactions and Notes">
-                                <field name="adverse_reaction"/>
-                            </group>
-                            <newline/>
-                            <field name="log_history"/>
-
-                        </page>
-
-                    </notebook>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_inpatient_medication_form</field>
         </record>
 
 
         <record model="ir.ui.view" id="gnuhealth_inpatient_medication_tree">
             <field name="model">gnuhealth.inpatient.medication</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Inpatient Medication"
-                    colors="If(Bool(Eval('is_active')),'blue','grey')">
-                    <field name="medicament" expand="1"/>
-                    <field name="start_treatment" expand="1"/>
-                    <field name="end_treatment" expand="1"/>
-                    <field name="admin_times"/>
-                    <field name="course_completed"/>
-                    <field name="discontinued"/>
-                    <field name="is_active" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_inpatient_medication_tree</field>
         </record>
 
 
@@ -339,35 +120,13 @@
         <record id="gnuhealth_inpatient_med_admin_time_form" model="ir.ui.view">
             <field name="model">gnuhealth.inpatient.medication.admin_time</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <form string="Inpatient Medication Admin Times">
-                        <label name="admin_time"/>
-                        <field name="admin_time"/>
-                        <label name="dose"/>
-                        <field name="dose"/>
-                        <label name="dose_unit"/>
-                        <field name="dose_unit"/>
-                        <label name="remarks"/>
-                        <field name="remarks"/>
-                    </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_inpatient_med_admin_time_form</field>
         </record>
 
         <record id="gnuhealth_inpatient_med_admin_time_tree" model="ir.ui.view">
             <field name="model">gnuhealth.inpatient.medication.admin_time</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <tree editable="top" string="Inpatient Medication Admin Times">
-                        <field name="admin_time"/>
-                        <field name="dose"/>
-                        <field name="dose_unit"/>
-                        <field name="remarks" expand="1"/>
-                    </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_inpatient_med_admin_time_tree</field>
         </record>
 
 
@@ -376,38 +135,13 @@
         <record id="gnuhealth_inpatient_med_log_form" model="ir.ui.view">
             <field name="model">gnuhealth.inpatient.medication.log</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <form string="Inpatient Medication Log">
-                        <label name="admin_time"/>
-                        <field name="admin_time"/>
-                        <label name="health_professional"/>
-                        <field name="health_professional"/>
-                        <label name="dose"/>
-                        <field name="dose"/>
-                        <label name="dose_unit"/>
-                        <field name="dose_unit"/>
-                        <label name="remarks"/>
-                        <field name="remarks"/>
-                    </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_inpatient_med_log_form</field>
         </record>
 
         <record id="gnuhealth_inpatient_med_log_tree" model="ir.ui.view">
             <field name="model">gnuhealth.inpatient.medication.log</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <tree editable="top" string="Inpatient Medication Log">
-                        <field name="admin_time" expand="1"/>
-                        <field name="health_professional" expand="1"/>
-                        <field name="dose"/>
-                        <field name="dose_unit"/>
-                        <field name="remarks" expand="1"/>
-                    </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_inpatient_med_log_tree</field>
         </record>
 
 <!-- Form view for diets related to beliefs / religions -->
@@ -415,20 +149,7 @@
         <record id="gnuhealth_inpatient_diet_belief_form" model="ir.ui.view">
             <field name="model">gnuhealth.diet.belief</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <form string="Diet related to beliefs">
-                        <label name="name"/>
-                        <field name="name"/>
-                        <label name="code"/>
-                        <field name="code"/>
-                        <newline/>
-                        <separator id="separator_diet_belief_description" colspan="4" string="Diet Description"/>
-                        <newline/>
-                        <field colspan="4" name="description"/>
-                    </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_inpatient_diet_belief_form</field>
         </record>
 
 <!-- Tree view for the Beliefs and religon related diets -->
@@ -436,15 +157,7 @@
         <record id="gnuhealth_inpatient_diet_belief_tree" model="ir.ui.view">
             <field name="model">gnuhealth.diet.belief</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <tree editable="top" string="Therapeutic Diet">
-                        <field name="name" expand="1"/>
-                        <field name="code" expand="1"/>
-                        <field name="description"/>
-                    </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_inpatient_diet_belief_tree</field>
         </record>
 
 <!-- Form view for the Therapeutic diet -->
@@ -452,20 +165,7 @@
         <record id="gnuhealth_inpatient_diet_therapeutic_form" model="ir.ui.view">
             <field name="model">gnuhealth.diet.therapeutic</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <form string="Therapeutic Diet">
-                        <label name="name"/>
-                        <field name="name"/>
-                        <label name="code"/>
-                        <field name="code"/>
-                        <newline/>
-                        <separator id="separator_diet_description" colspan="4" string="Diet Description and Indications"/>
-                        <newline/>
-                        <field colspan="4" name="description"/>
-                    </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_inpatient_diet_therapeutic_form</field>
         </record>
 
 <!-- Tree view for the Therapeutic diets -->
@@ -473,15 +173,7 @@
         <record id="gnuhealth_inpatient_diet_therapeutic_tree" model="ir.ui.view">
             <field name="model">gnuhealth.diet.therapeutic</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <tree editable="top" string="Therapeutic Diet">
-                        <field name="name" expand="1"/>
-                        <field name="code" expand="1"/>
-                        <field name="description"/>
-                    </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_inpatient_diet_belief_tree</field>
         </record>
 
 <!-- Form view for the Inpatient diet -->
@@ -489,18 +181,7 @@
         <record id="gnuhealth_inpatient_diet_form" model="ir.ui.view">
             <field name="model">gnuhealth.inpatient.diet</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <form string="Inpatient Diet">
-                        <label name="diet"/>
-                        <field name="diet"/>
-                        <newline/>
-                        <label name="remarks"/>
-                        <field colspan="4" name="remarks"/>
-
-                    </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_inpatient_diet_form</field>
         </record>
 
 
@@ -509,14 +190,7 @@
         <record id="gnuhealth_inpatient_diet_tree" model="ir.ui.view">
             <field name="model">gnuhealth.inpatient.diet</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <tree editable="top" string="Inpatient Diet">
-                        <field name="diet" expand="1"/>
-                        <field name="remarks" expand="1"/>
-                    </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_inpatient_diet_tree</field>
         </record>
 
 
@@ -525,35 +199,13 @@
         <record id="gnuhealth_bed_transfer_form" model="ir.ui.view">
             <field name="model">gnuhealth.bed.transfer</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <form string="Bed Transfer History">
-                        <label name="transfer_date"/>
-                        <field name="transfer_date"/>
-                        <label name="bed_from"/>
-                        <field name="bed_from"/>
-                        <label name="bed_to"/>
-                        <field name="bed_to"/>
-                        <label name="reason"/>
-                        <field name="reason"/>
-                    </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_bed_transfer_form</field>
         </record>
 
         <record id="gnuhealth_bed_transfer_tree" model="ir.ui.view">
             <field name="model">gnuhealth.bed.transfer</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <tree editable="top" string="Bed Transfer History">
-                        <field name="transfer_date" expand="1"/>
-                        <field name="bed_from" expand="1"/>
-                        <field name="bed_to" expand="1"/>
-                        <field name="reason" expand="1"/>
-                    </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_bed_transfer_tree</field>
         </record>
 
 
--- a/tryton/health_inpatient/setup.py
+++ b/tryton/health_inpatient/setup.py
@@ -61,7 +61,8 @@
     package_data={
         'trytond.modules.health_inpatient': info.get('xml', []) \
             + info.get('translation', []) \
-            + ['tryton.cfg', 'doc/*.rst', 'locale/*.po', 'report/*.odt', 'icons/*.svg'],
+            + ['tryton.cfg', 'view/*.xml', 'doc/*.rst', 'locale/*.po',
+               'report/*.odt', 'icons/*.svg'],
         },
 
     classifiers=[
new file mode 100644
--- /dev/null
+++ b/tryton/health_inpatient/view/gnuhealth_bed_transfer_form.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<form string="Bed Transfer History">
+    <label name="transfer_date"/>
+    <field name="transfer_date"/>
+    <label name="bed_from"/>
+    <field name="bed_from"/>
+    <label name="bed_to"/>
+    <field name="bed_to"/>
+    <label name="reason"/>
+    <field name="reason"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_inpatient/view/gnuhealth_bed_transfer_tree.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<tree editable="top" string="Bed Transfer History">
+    <field name="transfer_date" expand="1"/>
+    <field name="bed_from" expand="1"/>
+    <field name="bed_to" expand="1"/>
+    <field name="reason" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_inpatient/view/gnuhealth_inpatient_diet_belief_form.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<form string="Diet related to beliefs">
+    <label name="name"/>
+    <field name="name"/>
+    <label name="code"/>
+    <field name="code"/>
+    <newline/>
+    <separator id="separator_diet_belief_description" colspan="4" string="Diet Description"/>
+    <newline/>
+    <field colspan="4" name="description"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_inpatient/view/gnuhealth_inpatient_diet_belief_tree.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<tree editable="top" string="Therapeutic Diet">
+    <field name="name" expand="1"/>
+    <field name="code" expand="1"/>
+    <field name="description"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_inpatient/view/gnuhealth_inpatient_diet_form.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<form string="Inpatient Diet">
+    <label name="diet"/>
+    <field name="diet"/>
+    <newline/>
+    <label name="remarks"/>
+    <field colspan="4" name="remarks"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_inpatient/view/gnuhealth_inpatient_diet_therapeutic_form.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<form string="Therapeutic Diet">
+    <label name="name"/>
+    <field name="name"/>
+    <label name="code"/>
+    <field name="code"/>
+    <newline/>
+    <separator id="separator_diet_description" colspan="4" string="Diet Description and Indications"/>
+    <newline/>
+    <field colspan="4" name="description"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_inpatient/view/gnuhealth_inpatient_diet_therapeutic_tree.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<tree editable="top" string="Therapeutic Diet">
+    <field name="name" expand="1"/>
+    <field name="code" expand="1"/>
+    <field name="description"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_inpatient/view/gnuhealth_inpatient_diet_tree.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<tree editable="top" string="Inpatient Diet">
+    <field name="diet" expand="1"/>
+    <field name="remarks" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_inpatient/view/gnuhealth_inpatient_med_admin_time_form.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<form string="Inpatient Medication Admin Times">
+    <label name="admin_time"/>
+    <field name="admin_time"/>
+    <label name="dose"/>
+    <field name="dose"/>
+    <label name="dose_unit"/>
+    <field name="dose_unit"/>
+    <label name="remarks"/>
+    <field name="remarks"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_inpatient/view/gnuhealth_inpatient_med_admin_time_tree.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<tree editable="top" string="Inpatient Medication Admin Times">
+    <field name="admin_time"/>
+    <field name="dose"/>
+    <field name="dose_unit"/>
+    <field name="remarks" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_inpatient/view/gnuhealth_inpatient_med_log_form.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<form string="Inpatient Medication Log">
+    <label name="admin_time"/>
+    <field name="admin_time"/>
+    <label name="health_professional"/>
+    <field name="health_professional"/>
+    <label name="dose"/>
+    <field name="dose"/>
+    <label name="dose_unit"/>
+    <field name="dose_unit"/>
+    <label name="remarks"/>
+    <field name="remarks"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_inpatient/view/gnuhealth_inpatient_med_log_tree.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<tree editable="top" string="Inpatient Medication Log">
+    <field name="admin_time" expand="1"/>
+    <field name="health_professional" expand="1"/>
+    <field name="dose"/>
+    <field name="dose_unit"/>
+    <field name="remarks" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_inpatient/view/gnuhealth_inpatient_medication_form.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<form string="Inpatient Medication">
+    <notebook>
+        <page string="General Info" id="inpatient_medication_general_info">
+            <group id="inpatient_medication_header" string="Medication">
+                <label name="medicament"/>
+                <field name="medicament"/>
+                <label name="indication"/>
+                <field name="indication"/>
+            </group>
+            <newline/>
+            <newline/>
+            <group id="inpatient_treatment_period" string="Treatment period">
+                <label name="start_treatment"/>
+                <field name="start_treatment"/>
+                <label name="end_treatment"/>
+                <field name="end_treatment"/>
+            </group>
+            <newline/>
+            <group id="inpatient_medicament_form" string="Admnistration">
+                <label name="form"/>
+                <field name="form"/>
+                <label name="route"/>
+                <field name="route"/>
+            </group>
+            <newline/>
+            <group id="inpatient_medicament_dosage" colspan="4" col="8" string="Dosage">
+                <label name="dose"/>
+                <field name="dose"/>
+                <label name="dose_unit"/>
+                <field name="dose_unit"/>
+                <label name="qty"/>
+                <field name="qty"/>
+                <label name="common_dosage"/>
+                <field name="common_dosage"/>
+            </group>
+            <newline/>
+            <field colspan="4" name="admin_times"/>
+            <newline/>
+        </page>
+        <page id="inpatient_medication_misc" string="Extra Info">
+            <group id="inpatient_treatment_status" string="Status">
+                <label name="is_active"/>
+                <field name="is_active"/>
+                <label name="course_completed"/>
+                <field name="course_completed"/>
+                <label name="discontinued"/>
+                <field name="discontinued"/>
+                <label name="discontinued_reason"/>
+                <field name="discontinued_reason"/>
+            </group>
+            <newline/>
+            <group id="inpatient_medication_adeverse_effects" string="Adverse Reactions and Notes">
+                <field name="adverse_reaction"/>
+            </group>
+            <newline/>
+            <field name="log_history"/>
+        </page>
+    </notebook>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_inpatient/view/gnuhealth_inpatient_medication_tree.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<tree string="Inpatient Medication" colors="If(Bool(Eval('is_active')),'blue','grey')">
+    <field name="medicament" expand="1"/>
+    <field name="start_treatment" expand="1"/>
+    <field name="end_treatment" expand="1"/>
+    <field name="admin_times"/>
+    <field name="course_completed"/>
+    <field name="discontinued"/>
+    <field name="is_active" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_inpatient/view/gnuhealth_inpatient_registration.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<form string="Inpatient Registration Information">
+    <notebook>
+        <page string="Administrative data" id="page_admin_data">
+            <group colspan="4" id="group_admin_data_holder1">
+                <group colspan="2" id="group_admin_data">
+                    <label name="name"/>
+                    <field name="name"/>
+                    <label name="patient"/>
+                    <field name="patient"/>
+                </group>
+                <group colspan="2" id="group_admin_bed">
+                    <label name="bed"/>
+                    <field name="bed"/>
+                </group>
+                <newline/>
+                <group colspan="4" id="group_admin_data_holder2">
+                    <label name="hospitalization_date"/>
+                    <field name="hospitalization_date"/>
+                    <label name="discharge_date"/>
+                    <field name="discharge_date"/>
+                    <label name="attending_physician"/>
+                    <field name="attending_physician"/>
+                    <label name="operating_physician"/>
+                    <field name="operating_physician"/>
+                </group>
+                <group colspan="4" id="group_admin_data_holder3">
+                    <label name="admission_type"/>
+                    <field name="admission_type"/>
+                    <label name="admission_reason"/>
+                    <field name="admission_reason"/>
+                    <newline/>
+                    <label name="info" colspan="4"/>
+                    <field name="info" colspan="4"/>
+                </group>
+            </group>
+            <newline/>
+            <field name="bed_transfers"/>
+            <newline/>
+            <group colspan="4" id="group_registration_holder1">
+                <group colspan="2" id="group_registration_holder2">
+                    <field name="state" readonly="1"/>
+                    <button name="confirmed" string="Confirm" help="Confirm Registration / Make the reservation" icon="icon-ok"/>
+                </group>
+                <group colspan="2" id="group_registration_holder3">
+                    <button name="cancel" help="Cancel Registration" string="Cancel" icon="icon-cancel" confirm="Cancel the patient registration process ?"/>
+                    <button name="admission" help="Patient Admission" string="Admission" icon="icon-ok" confirm="Admit the patient in the health institution and assign the bed"/>
+                    <button name="discharge" help="Discharge Patient" string="Discharge" icon="icon-home" confirm="You are about to discharge the patient from the health institution."/>
+                </group>
+            </group>
+        </page>
+        <page string="Nutrition" id="page_inpatient_nutrition">
+            <label name="diet_belief"/>
+            <field name="diet_belief"/>
+            <label name="diet_vegetarian"/>
+            <field name="diet_vegetarian"/>
+            <newline/>
+            <field colspan="4" name="therapeutic_diets"/>
+            <newline/>
+            <separator colspan="4" id="separator_nutrition_notes" string="Other nutrition notes / directions"/>
+            <newline/>
+            <field colspan="4" name="nutrition_notes"/>
+        </page>
+        <page string="Medication" id="page_inpatient_medication">
+            <field name="medications"/>
+        </page>
+        <page string="Care Plan" id="page_care_plan">
+            <label name="nursing_plan"/>
+            <field name="nursing_plan"/>
+            <newline/>
+            <label name="discharge_plan"/>
+            <field name="discharge_plan"/>
+        </page>
+    </notebook>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_inpatient/view/gnuhealth_inpatient_registration_tree.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<tree string="Inpatient Registration Info" colors="If(And(Equal(Eval('state'), 'hospitalized'), Equal(Eval('admission_type'), 'elective' )), 'blue',If(Equal(Eval('admission_type'), 'emergency'), 'red', If(Equal(Eval('admission_type'), 'maternity'), 'blue','black')))">
+    <field name="name" expand="1"/>
+    <field name="patient" expand="1"/>
+    <field name="hospitalization_date" expand="1"/>
+    <field name="discharge_date" expand="1"/>
+    <field name="bed" expand="1"/>
+    <field name="admission_type" expand="1"/>
+    <field name="state" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_inpatient/view/gnuhealth_patient_extd_tree.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<data>
+    <xpath expr="/tree/field[@name=&quot;identification_code&quot;]" position="after">
+        <field name="patient_status"/>
+    </xpath>
+</data>
new file mode 100644
--- /dev/null
+++ b/tryton/health_inpatient/view/partner_form.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<data>
+    <xpath expr="/form/group/field[@name=&quot;institution&quot;]" position="after">
+        <label name="inpatient_registration_code"/>
+        <field name="inpatient_registration_code"/>
+    </xpath>
+</data>
new file mode 100644
--- /dev/null
+++ b/tryton/health_inpatient/view/patient_form.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<data>
+    <xpath expr="//field[@name=&quot;rh&quot;]" position="after">
+        <field name="patient_status"/>
+    </xpath>
+</data>
--- a/tryton/health_inpatient_calendar/health_inpatient_calendar_view.xml
+++ b/tryton/health_inpatient_calendar/health_inpatient_calendar_view.xml
@@ -8,20 +8,7 @@
             <field name="model">gnuhealth.hospital.bed</field>
             <field name="type">form</field>
             <field name="inherit" ref="health.gnuhealth_hospital_bed_view"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/form/newline"
-                        position="replace">
-
-                        <label name="calendar"/>
-                        <field name="calendar"/>
-
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_calendar_hospital_bed</field>
         </record>
             
     <!-- Patient hospitalization and bed registration (in-patient registration) -->
@@ -30,21 +17,7 @@
             <field name="model">gnuhealth.inpatient.registration</field>
             <field name="type">form</field>
             <field name="inherit" ref="health_inpatient.gnuhealth_inpatient_registration_view"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/form/notebook/page[@id=&quot;page_admin_data&quot;]/group[@id=&quot;group_admin_data_holder1&quot;]/group[@id=&quot;group_admin_data_holder2&quot;]/field[@name=&quot;discharge_date&quot;]"
-                        position="after">
-
-                        <label name="event"/>
-                        <field name="event"/>
-                        <newline/>
-
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_calendar_inpatient_registration</field>
         </record>
 
     </data>
--- a/tryton/health_inpatient_calendar/setup.py
+++ b/tryton/health_inpatient_calendar/setup.py
@@ -60,7 +60,8 @@
     package_data={
         'trytond.modules.health_inpatient_calendar': info.get('xml', []) \
             + info.get('translation', []) \
-            + ['tryton.cfg', 'doc/*.rst', 'locale/*.po', 'report/*.odt', 'icons/*.svg'],
+            + ['tryton.cfg', 'view/*.xml', 'doc/*.rst', 'locale/*.po',
+               'report/*.odt', 'icons/*.svg'],
         },
 
     classifiers=[
new file mode 100644
--- /dev/null
+++ b/tryton/health_inpatient_calendar/view/gnuhealth_calendar_hospital_bed.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<data>
+    <xpath expr="/form/newline" position="replace">
+        <label name="calendar"/>
+        <field name="calendar"/>
+    </xpath>
+</data>
new file mode 100644
--- /dev/null
+++ b/tryton/health_inpatient_calendar/view/gnuhealth_calendar_inpatient_registration.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data>
+    <xpath expr="/form/notebook/page[@id=&quot;page_admin_data&quot;]/group[@id=&quot;group_admin_data_holder1&quot;]/group[@id=&quot;group_admin_data_holder2&quot;]/field[@name=&quot;discharge_date&quot;]" position="after">
+        <label name="event"/>
+        <field name="event"/>
+        <newline/>
+    </xpath>
+</data>
--- a/tryton/health_lab/health_lab_view.xml
+++ b/tryton/health_lab/health_lab_view.xml
@@ -32,29 +32,13 @@
         <record model="ir.ui.view" id="gnuhealth_lab_unit_form">
             <field name="model">gnuhealth.lab.test.units</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Test Unit">
-                    <label name="name"/>
-                    <field name="name"/>
-                    <label name="code"/>
-                    <field name="code"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_lab_unit_form</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_lab_unit_tree">
             <field name="model">gnuhealth.lab.test.units</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Test Unit">
-                    <field name="name" expand="1"/>
-                    <field name="code" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_lab_unit_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="gnuhealth_action_lab_unit">
@@ -80,46 +64,13 @@
         <record model="ir.ui.view" id="gnuhealth_lab_test_request_form">
             <field name="model">gnuhealth.patient.lab.test</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Test Requests">
-                    <label name="request"/>
-                    <field name="request"/>
-                    <newline/>
-                    <label name="name"/>
-                    <field name="name"/>
-                    <label name="date"/>
-                    <field name="date"/>
-                    <label name="patient_id"/>
-                    <field name="patient_id"/>
-                    <label name="doctor_id"/>
-                    <field name="doctor_id"/>
-                    <label name="urgent"/>
-                    <field name="urgent"/>
-                    <label name="state"/>
-                    <field name="state" readonly="1"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_lab_test_request_form</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_lab_test_request_tree">
             <field name="model">gnuhealth.patient.lab.test</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Test Requests"
-                    colors="If(Equal(Eval('state'), 'draft'), 'blue', If(In(Eval('state'), ['cancel','open']), 'gray', 'black'))">
-                    <field name="request" expand="1"/>
-                    <field name="name" expand="1"/>
-                    <field name="date" expand="1"/>
-                    <field name="patient_id" expand="1"/>
-                    <field name="doctor_id" expand="1"/>
-                    <field name="state" readonly="1" expand="1"/>
-                    <field name="urgent"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_lab_test_request_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="gnuhealth_action_lab_test_request">
@@ -145,85 +96,25 @@
         <record model="ir.ui.view" id="gnuhealth_lab_test_view">
             <field name="model">gnuhealth.lab.test_type</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Lab Test Type">
-                    <notebook>
-                        <page string="Main Info" id="test_type_main_info">
-                            <label name="name"/>
-                            <field name="name"/>
-                            <label name="code"/>
-                            <field name="code"/>
-                            <field name="critearea" colspan="4"
-                                view_ids="health_lab.test_critearea_view_tree_test_type,health_lab.test_critearea_view_form_test_type"/>
-                            <label name="product_id"/>
-                            <field name="product_id"/>
-                        </page>
-                        <page string="Extra Info" id="test_type_extra_info">
-                            <label name="info"/>
-                            <field name="info"/>
-                        </page>
-                    </notebook>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_lab_test</field>
         </record>
         <record model="ir.ui.view" id="test_critearea_view_tree_test_type">
             <field name="model">gnuhealth.lab.test.critearea</field>
             <field name="type">tree</field>
             <field name="priority" eval="10"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Analyte">
-                    <field name="sequence" expand="1"/>
-                    <field name="name" expand="1"/>
-                    <field name="lower_limit" expand="1"/>
-                    <field name="upper_limit" expand="1"/>
-                    <field name="normal_range" expand="1"/>
-                    <field name="units" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">test_critearea_tree_test_type</field>
         </record>
         <record model="ir.ui.view" id="test_critearea_view_form_test_type">
             <field name="model">gnuhealth.lab.test.critearea</field>
             <field name="type">form</field>
             <field name="priority" eval="20"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Analyte">
-                    <label name="name"/>
-                    <field name="name"/>
-                    <label name="units"/>
-                    <field name="units"/>
-                    <label name="sequence"/>
-                    <field name="sequence"/>
-                    <newline/>
-                    <label name="lower_limit"/>
-                    <field name="lower_limit"/>
-                    <label name="upper_limit"/>
-                    <field name="upper_limit"/>
-                    <newline/>
-                    <separator colspan="4" id="analyte_reference"
-                        string="Reference Value / Range"/>
-                    <newline/>
-                    <field colspan="4" name="normal_range"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">test_critearea_form_test_type</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_lab_test_tree">
             <field name="model">gnuhealth.lab.test_type</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string='Lab test type'>
-                    <field name="name" expand="1"/>
-                    <field name="code" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_lab_test_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="gnuhealth_action_list_test">
@@ -250,108 +141,25 @@
         <record model="ir.ui.view" id="gnuhealth_lab_view">
             <field name="model">gnuhealth.lab</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Laboratory Test">
-                    <notebook>
-                        <page string="Main Info" id="lab_main_info">
-                            <label name="name"/>
-                            <field name="name"/>
-                            <label name="test"/>
-                            <field name="test"/>
-                            <label name="date_analysis"/>
-                            <field name="date_analysis"/>
-                            <newline/>
-                            <label name="patient"/>
-                            <field name="patient"/>
-                            <label name="pathologist"/>
-                            <field name="pathologist"/>
-                            <newline/>
-                            <label name="date_requested"/>
-                            <field name="date_requested"/>
-                            <label name="requestor"/>
-                            <field name="requestor"/>
-                            <field name="critearea" colspan="4"
-                                view_ids="health_lab.test_critearea_view_tree_lab,health_lab.test_critearea_view_form_lab"/>
-                        </page>
-                        <page string="Extra Info" id="lab_extra_info">
-                            <label name="results"/>
-                            <field name="results"/>
-                            <newline/>
-                            <label name="diagnosis"/>
-                            <field name="diagnosis"/>
-                        </page>
-                    </notebook>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_lab</field>
         </record>
         <record model="ir.ui.view" id="test_critearea_view_tree_lab">
             <field name="model">gnuhealth.lab.test.critearea</field>
             <field name="type">tree</field>
             <field name="priority" eval="10"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree editable="top" string="Test Cases"
-                    colors="If(Bool(Eval('warning')), 'red', 'black')">
-                    <field name="warning" expand="1"/>
-                    <field name="excluded" expand="1"/>
-                    <field name="name" expand="1"/>
-                    <field name="result" expand="1"/>
-                    <field name="result_text" expand="1"/>
-                    <field name="lower_limit" expand="1"/>
-                    <field name="upper_limit" expand="1"/>
-                    <field name="units" expand="1"/>
-                    <field name="remarks" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">test_critearea_tree_lab</field>
         </record>
         <record model="ir.ui.view" id="test_critearea_view_form_lab">
             <field name="model">gnuhealth.lab.test.critearea</field>
             <field name="type">form</field>
             <field name="priority" eval="20"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Test Cases">
-                    <label name="warning"/>
-                    <field name="warning"/>
-                    <label name="excluded"/>
-                    <field name="excluded"/>
-                    <label name="name"/>
-                    <field name="name"/>
-                    <label name="result"/>
-                    <field name="result"/>
-                    <label name="units"/>
-                    <field name="units"/>
-                    <label name="result_text"/>
-                    <field name="result_text"/>
-                    <label name="lower_limit"/>
-                    <field name="lower_limit"/>
-                    <label name="upper_limit"/>
-                    <field name="upper_limit"/>
-                    <label name="normal_range"/>
-                    <field name="normal_range"/>
-                    <label name="remarks"/>
-                    <field name="remarks"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">test_critearea_form_lab</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_lab_tree">
             <field name="model">gnuhealth.lab</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Lab test type">
-                    <field name="name" expand="1"/>
-                    <field name="test" expand="1"/>
-                    <field name="patient" expand="1"/>
-                    <field name="date_analysis" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_lab_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="gnuhealth_action_tree_lab">
--- a/tryton/health_lab/setup.py
+++ b/tryton/health_lab/setup.py
@@ -62,7 +62,8 @@
     package_data={
         'trytond.modules.health_lab': info.get('xml', []) \
             + info.get('translation', []) \
-            + ['tryton.cfg', 'doc/*.rst', 'locale/*.po', 'report/*.odt', 'icons/*.svg'],
+            + ['tryton.cfg', 'view/*.xml', 'doc/*.rst', 'locale/*.po',
+               'report/*.odt', 'icons/*.svg'],
         },
 
     classifiers=[
new file mode 100644
--- /dev/null
+++ b/tryton/health_lab/view/gnuhealth_lab.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<form string="Laboratory Test">
+    <notebook>
+        <page string="Main Info" id="lab_main_info">
+            <label name="name"/>
+            <field name="name"/>
+            <label name="test"/>
+            <field name="test"/>
+            <label name="date_analysis"/>
+            <field name="date_analysis"/>
+            <newline/>
+            <label name="patient"/>
+            <field name="patient"/>
+            <label name="pathologist"/>
+            <field name="pathologist"/>
+            <newline/>
+            <label name="date_requested"/>
+            <field name="date_requested"/>
+            <label name="requestor"/>
+            <field name="requestor"/>
+            <field name="critearea" colspan="4" view_ids="health_lab.test_critearea_view_tree_lab,health_lab.test_critearea_view_form_lab"/>
+        </page>
+        <page string="Extra Info" id="lab_extra_info">
+            <label name="results"/>
+            <field name="results"/>
+            <newline/>
+            <label name="diagnosis"/>
+            <field name="diagnosis"/>
+        </page>
+    </notebook>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_lab/view/gnuhealth_lab_test.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<form string="Lab Test Type">
+    <notebook>
+        <page string="Main Info" id="test_type_main_info">
+            <label name="name"/>
+            <field name="name"/>
+            <label name="code"/>
+            <field name="code"/>
+            <field name="critearea" colspan="4" view_ids="health_lab.test_critearea_view_tree_test_type,health_lab.test_critearea_view_form_test_type"/>
+            <label name="product_id"/>
+            <field name="product_id"/>
+        </page>
+        <page string="Extra Info" id="test_type_extra_info">
+            <label name="info"/>
+            <field name="info"/>
+        </page>
+    </notebook>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_lab/view/gnuhealth_lab_test_request_form.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<form string="Test Requests">
+    <label name="request"/>
+    <field name="request"/>
+    <newline/>
+    <label name="name"/>
+    <field name="name"/>
+    <label name="date"/>
+    <field name="date"/>
+    <label name="patient_id"/>
+    <field name="patient_id"/>
+    <label name="doctor_id"/>
+    <field name="doctor_id"/>
+    <label name="urgent"/>
+    <field name="urgent"/>
+    <label name="state"/>
+    <field name="state" readonly="1"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_lab/view/gnuhealth_lab_test_request_tree.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<tree string="Test Requests" colors="If(Equal(Eval('state'), 'draft'), 'blue', If(In(Eval('state'), ['cancel','open']), 'gray', 'black'))">
+    <field name="request" expand="1"/>
+    <field name="name" expand="1"/>
+    <field name="date" expand="1"/>
+    <field name="patient_id" expand="1"/>
+    <field name="doctor_id" expand="1"/>
+    <field name="state" readonly="1" expand="1"/>
+    <field name="urgent"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_lab/view/gnuhealth_lab_test_tree.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<tree string="Lab test type">
+    <field name="name" expand="1"/>
+    <field name="code" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_lab/view/gnuhealth_lab_tree.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<tree string="Lab test type">
+    <field name="name" expand="1"/>
+    <field name="test" expand="1"/>
+    <field name="patient" expand="1"/>
+    <field name="date_analysis" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_lab/view/gnuhealth_lab_unit_form.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<form string="Test Unit">
+    <label name="name"/>
+    <field name="name"/>
+    <label name="code"/>
+    <field name="code"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_lab/view/gnuhealth_lab_unit_tree.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<tree string="Test Unit">
+    <field name="name" expand="1"/>
+    <field name="code" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_lab/view/test_critearea_form_lab.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<form string="Test Cases">
+    <label name="warning"/>
+    <field name="warning"/>
+    <label name="excluded"/>
+    <field name="excluded"/>
+    <label name="name"/>
+    <field name="name"/>
+    <label name="result"/>
+    <field name="result"/>
+    <label name="units"/>
+    <field name="units"/>
+    <label name="result_text"/>
+    <field name="result_text"/>
+    <label name="lower_limit"/>
+    <field name="lower_limit"/>
+    <label name="upper_limit"/>
+    <field name="upper_limit"/>
+    <label name="normal_range"/>
+    <field name="normal_range"/>
+    <label name="remarks"/>
+    <field name="remarks"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_lab/view/test_critearea_form_test_type.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<form string="Analyte">
+    <label name="name"/>
+    <field name="name"/>
+    <label name="units"/>
+    <field name="units"/>
+    <label name="sequence"/>
+    <field name="sequence"/>
+    <newline/>
+    <label name="lower_limit"/>
+    <field name="lower_limit"/>
+    <label name="upper_limit"/>
+    <field name="upper_limit"/>
+    <newline/>
+    <separator colspan="4" id="analyte_reference" string="Reference Value / Range"/>
+    <newline/>
+    <field colspan="4" name="normal_range"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_lab/view/test_critearea_tree_lab.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<tree editable="top" string="Test Cases" colors="If(Bool(Eval('warning')), 'red', 'black')">
+    <field name="warning" expand="1"/>
+    <field name="excluded" expand="1"/>
+    <field name="name" expand="1"/>
+    <field name="result" expand="1"/>
+    <field name="result_text" expand="1"/>
+    <field name="lower_limit" expand="1"/>
+    <field name="upper_limit" expand="1"/>
+    <field name="units" expand="1"/>
+    <field name="remarks" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_lab/view/test_critearea_tree_test_type.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<tree string="Analyte">
+    <field name="sequence" expand="1"/>
+    <field name="name" expand="1"/>
+    <field name="lower_limit" expand="1"/>
+    <field name="upper_limit" expand="1"/>
+    <field name="normal_range" expand="1"/>
+    <field name="units" expand="1"/>
+</tree>
--- a/tryton/health_lifestyle/health_lifestyle_view.xml
+++ b/tryton/health_lifestyle/health_lifestyle_view.xml
@@ -14,97 +14,13 @@
         <record model="ir.ui.view" id="gnuhealth_drugs_recreational_view">
             <field name="model">gnuhealth.drugs_recreational</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Recreational Drugs">
-
-                    <group string="General Information" id="group_general_info">
-                        <label name="name"/>
-                        <field name="name"/>
-                        <label name="street_name"/>
-                        <field name="street_name"/>
-                        <newline/>
-                        <label name="toxicity"/>
-                        <field name="toxicity"/>
-                        <label name="addiction_level"/>
-                        <field name="addiction_level"/>
-                        <label name="legal_status"/>
-                        <field name="legal_status"/>
-                        <label name="category"/>
-                        <field name="category"/>
-                    </group>
-                    <newline/>
-
-                    <separator colspan="4" string="DEA Schedule Level" id="separator_DEA"/>
-                    <newline/>
-
-                    <group col="10" id="group_dea">
-                        <label name="dea_schedule_i"/>
-                        <field name="dea_schedule_i"/>
-                        <label name="dea_schedule_ii"/>
-                        <field name="dea_schedule_ii"/>
-                        <label name="dea_schedule_iii"/>
-                        <field name="dea_schedule_iii"/>
-                        <label name="dea_schedule_iv"/>
-                        <field name="dea_schedule_iv"/>
-                        <label name="dea_schedule_v"/>
-                        <field name="dea_schedule_v"/>
-                    </group>
-                    <newline/>
-
-                    <separator colspan="4" string="Henningfield Rating" id="separator_henningfield"/>
-                    <newline/>
-
-                    <group col="10" id="group_henningfield">
-                        <label name="withdrawal_level"/>
-                        <field name="withdrawal_level"/>
-                        <label name="reinforcement_level"/>
-                        <field name="reinforcement_level"/>
-                        <label name="tolerance_level"/>
-                        <field name="tolerance_level"/>
-                        <label name="dependence_level"/>
-                        <field name="dependence_level"/>
-                        <label name="intoxication_level"/>
-                        <field name="intoxication_level"/>
-                    </group>
-
-                    <separator colspan="4" string="Administration Routes" id="separator_admin_route"/>
-                    <group colspan="4" id="group_admin_route">
-                        <label name="route_oral"/>
-                        <field name="route_oral"/>
-                        <label name="route_inhaling"/>
-                        <field name="route_inhaling"/>
-                        <label name="route_popping"/>
-                        <field name="route_popping"/>
-                        <label name="route_sniffing"/>
-                        <field name="route_sniffing"/>
-                        <label name="route_injection"/>
-                        <field name="route_injection"/>
-                    </group>
-                    <newline/>
-
-                    <separator colspan="4" string="Additional Info and Effects" id="separator_additional_info"/>
-
-                    <field name="info" colspan="4"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_drugs_recreational</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_drugs_recreational_tree">
             <field name="model">gnuhealth.drugs_recreational</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Recreational Drugs">
-                    <field name="name"/>
-                    <field name="category"/>
-                    <field name="toxicity"/>
-                    <field name="addiction_level"/>
-                    <field name="street_name"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_drugs_recreational_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="gnuhealth_action_drugs_recreational">
@@ -131,29 +47,13 @@
         <record model="ir.ui.view" id="gnuhealth_recreational_drugs_view">
             <field name="model">gnuhealth.patient.recreational_drugs</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Patient Recreational Drugs">
-                    <label name="patient"/>
-                    <field name="patient"/>
-                    <label name="recreational_drug"/>
-                    <field name="recreational_drug"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_recreational_drugs</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_recreational_drugs_tree">
             <field name="model">gnuhealth.patient.recreational_drugs</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Patient Recreational Drugs">
-                    <field name="patient"/>
-                    <field name="recreational_drug" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_recreational_drugs_tree</field>
         </record>
 
 <!-- PATIENT CAGE -->
@@ -161,41 +61,13 @@
         <record model="ir.ui.view" id="gnuhealth_patient_cage_view">
             <field name="model">gnuhealth.patient.cage</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Patient CAGE Questionnaire">
-                        <field name="evaluation_date"/>
-                        <field name="evaluation_date"/>
-                        <label name="cage_c"/>
-                        <field name="cage_c"/>
-                        <label name="cage_a"/>
-                        <field name="cage_a"/>
-                        <label name="cage_g"/>
-                        <field name="cage_g"/>
-                        <label name="cage_e"/>
-                        <field name="cage_e"/>
-                        <label name="cage_score"/>
-                        <field name="cage_score"/>                        
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_patient_cage</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_patient_cage_tree">
             <field name="model">gnuhealth.patient.cage</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree editable="top" string="Patient CAGE SCORE"  colors = "If(Greater(Eval('cage_score',0), 1),'red','blue')"> 
-                    <field name="evaluation_date"/>
-                    <field name="cage_c"/>
-                    <field name="cage_a"/>
-                    <field name="cage_g"/>
-                    <field name="cage_e"/>
-                    <field name="cage_score"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_patient_cage_tree</field>
         </record>
 
 
@@ -205,182 +77,7 @@
             <field name="model">gnuhealth.patient</field>
             <field name="inherit" ref="health.gnuhealth_patient_view_form" />
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/form/notebook/page[@id=&quot;patient_diseases&quot;]"
-                        position="after">
-
-                        <page string="Lifestyle" id="patient_lifestyle">
-                            <notebook>
-                                <page string="Diet and Exersice" id="diet_and_exercise">
-
-                                    <group colspan="4" id="group_holder1">
-                                        <group col="4" string="Physical Exercise" id="physical_exercise">
-                                            <label name="exercise"/>
-                                            <field name="exercise"/>
-                                            <label name="exercise_minutes_day"/>
-                                            <field name="exercise_minutes_day"/>
-                                        </group>
-
-                                        <group col="4" string="Sleep" id="group_sleep">
-                                            <label name="sleep_hours"/>
-                                            <field name="sleep_hours"/>
-                                            <label name="sleep_during_daytime"/>
-                                            <field name="sleep_during_daytime"/>
-                                        </group>
-                                        <newline/>
-                                        <group colspan="4" col="8" id="group_diet">
-                                            <label name="number_of_meals"/>
-                                            <field name="number_of_meals"/>
-                                            <label name="eats_alone"/>
-                                            <field name="eats_alone"/>
-                                            <label name="coffee"/>
-                                            <field name="coffee"/>
-                                            <label name="coffee_cups"/>
-                                            <field name="coffee_cups"/>
-                                            <label name="soft_drinks"/>
-                                            <field name="soft_drinks"/>
-                                            <label name="salt"/>
-                                            <field name="salt"/>
-                                            <label name="diet"/>
-                                            <field name="diet"/>
-                                            <label name="diet_info"/>
-                                            <field name="diet_info"/>
-                                        </group>
-                                        <newline/>
-                                        <group colspan="4" id="group_lifestyle">
-                                            <field name="lifestyle_info"/>
-                                        </group>
-
-                                    </group>
-
-                                </page>
-
-                                <page string="Addictions" id="page_addictions">
-                                    <notebook>
-                                        <page string="Main" id="page_addictions_main">
-
-                                            <group colspan="4" col="8" id="group_addictions_main">
-                                                <label name="smoking"/>
-                                                <field name="smoking"/>
-                                                <label name="smoking_number"/>
-                                                <field name="smoking_number"/>
-                                                <label name="ex_smoker"/>
-                                                <field name="ex_smoker"/>
-                                                <label name="second_hand_smoker"/>
-                                                <field name="second_hand_smoker"/>
-                                                <label name="age_start_smoking"/>
-                                                <field name="age_start_smoking"/>
-                                                <label name="age_quit_smoking"/>
-                                                <field name="age_quit_smoking"/>
-                                                <label name="drug_usage"/>
-                                                <field name="drug_usage"/>
-                                                <label name="drug_iv"/>
-                                                <field name="drug_iv"/>
-                                                <label name="ex_drug_addict"/>
-                                                <field name="ex_drug_addict"/>
-                                                <label name="age_start_drugs"/>
-                                                <field name="age_start_drugs"/>
-
-                                                <label name="age_quit_drugs"/>
-                                                <field name="age_quit_drugs"/>
-
-                                            </group>
-                                        </page>
-                                        <page string="Alcohol" id="page_alchohol">
-                                            <group colspan="2" id="group_alcohol">
-                                                <label name="alcohol" />
-                                                <field name="alcohol" />
-                                                <label name="ex_alcoholic" />
-                                                <field name="ex_alcoholic" />
-                                                <label name="age_start_drinking"/>
-                                                <field name="age_start_drinking"/>
-                                                <label name="age_quit_drinking"/>
-                                                <field name="age_quit_drinking"/>
-                                                <label name="alcohol_beer_number"/>
-                                                <field name="alcohol_beer_number"/>
-                                                <label name="alcohol_wine_number"/>
-                                                <field name="alcohol_wine_number"/>
-
-                                                <label name="alcohol_liquor_number"/>
-                                                <field name="alcohol_liquor_number"/>
-                                            </group>
-                                            <field name="cage"/>
-                                        </page>
-                                        <page string="Recreational Drugs" id="page_recreational_drugs">
-                                            <field name="recreational_drugs"/>
-                                        </page>
-                                    </notebook>
-                                </page>
-
-                                <page string="Sexuality" id="page_sexuality">
-                                    <group colspan="4" col="12" id="group_sexuality">
-                                        <label name="sexual_preferences"/>
-                                        <field name="sexual_preferences"/>
-                                        <label name="sexual_partners"/>
-                                        <field name="sexual_partners"/>
-                                        <label name="sexual_partners_number"/>
-                                        <field name="sexual_partners_number"/>
-                                        <newline/>
-                                        <label name="first_sexual_encounter"/>
-                                        <field name="first_sexual_encounter"/>
-                                        <label name="sexual_practices"/>
-                                        <field name="sexual_practices"/>
-                                        <label name="anticonceptive"/>
-                                        <field name="anticonceptive"/>
-                                    </group>
-                                    <newline/>
-                                    <group colspan="4" col="6" string="Sexual practices" id="group_other_sexual_practices">
-                                        <group id="group_sexual_holder">
-                                            <label name="sex_oral"/>
-                                            <field name="sex_oral"/>
-                                            <newline/>
-                                            <label name="sex_anal"/>
-                                            <field name="sex_anal"/>
-                                        </group>
-                                        <group id="group_prostitution">
-                                            <label name="prostitute"/>
-                                            <field name="prostitute"/>
-                                            <newline/>
-                                            <label name="sex_with_prostitutes"/>
-                                            <field name="sex_with_prostitutes"/>
-                                        </group>
-                                        <group colspan="4" id="group_sexuality_notes">
-                                            <field name="sexuality_info"/>
-                                        </group>
-                                    </group>
-                                </page>
-
-                                <page string="Safety" id="page_safety">
-
-                                    <group colspan="4" col="6" string="Drive and Home Safety" id="group_drive_and_safety">
-                                        <label name="motorcycle_rider"/>
-                                        <field name="motorcycle_rider"/>
-                                        <label name="helmet"/>
-                                        <field name="helmet"/>
-                                        <label name="traffic_laws"/>
-                                        <field name="traffic_laws"/>
-                                        <label name="car_revision"/>
-                                        <field name="car_revision"/>
-                                        <label name="car_seat_belt"/>
-                                        <field name="car_seat_belt"/>
-                                        <label name="car_child_safety"/>
-                                        <field name="car_child_safety"/>
-                                        <label name="home_safety"/>
-                                        <field name="home_safety"/>
-                                    </group>
-
-                                </page>
-
-                            </notebook>
-                        </page>
-
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_patient</field>
         </record>
 
     </data>
--- a/tryton/health_lifestyle/setup.py
+++ b/tryton/health_lifestyle/setup.py
@@ -60,7 +60,8 @@
     package_data={
         'trytond.modules.health_lifestyle': info.get('xml', []) \
             + info.get('translation', []) \
-            + ['tryton.cfg', 'doc/*.rst', 'locale/*.po', 'report/*.odt', 'icons/*.svg'],
+            + ['tryton.cfg', 'view/*.xml', 'doc/*.rst', 'locale/*.po',
+               'report/*.odt', 'icons/*.svg'],
         },
 
     classifiers=[
new file mode 100644
--- /dev/null
+++ b/tryton/health_lifestyle/view/gnuhealth_drugs_recreational.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0"?>
+<form string="Recreational Drugs">
+    <group string="General Information" id="group_general_info">
+        <label name="name"/>
+        <field name="name"/>
+        <label name="street_name"/>
+        <field name="street_name"/>
+        <newline/>
+        <label name="toxicity"/>
+        <field name="toxicity"/>
+        <label name="addiction_level"/>
+        <field name="addiction_level"/>
+        <label name="legal_status"/>
+        <field name="legal_status"/>
+        <label name="category"/>
+        <field name="category"/>
+    </group>
+    <newline/>
+    <separator colspan="4" string="DEA Schedule Level" id="separator_DEA"/>
+    <newline/>
+    <group col="10" id="group_dea">
+        <label name="dea_schedule_i"/>
+        <field name="dea_schedule_i"/>
+        <label name="dea_schedule_ii"/>
+        <field name="dea_schedule_ii"/>
+        <label name="dea_schedule_iii"/>
+        <field name="dea_schedule_iii"/>
+        <label name="dea_schedule_iv"/>
+        <field name="dea_schedule_iv"/>
+        <label name="dea_schedule_v"/>
+        <field name="dea_schedule_v"/>
+    </group>
+    <newline/>
+    <separator colspan="4" string="Henningfield Rating" id="separator_henningfield"/>
+    <newline/>
+    <group col="10" id="group_henningfield">
+        <label name="withdrawal_level"/>
+        <field name="withdrawal_level"/>
+        <label name="reinforcement_level"/>
+        <field name="reinforcement_level"/>
+        <label name="tolerance_level"/>
+        <field name="tolerance_level"/>
+        <label name="dependence_level"/>
+        <field name="dependence_level"/>
+        <label name="intoxication_level"/>
+        <field name="intoxication_level"/>
+    </group>
+    <separator colspan="4" string="Administration Routes" id="separator_admin_route"/>
+    <group colspan="4" id="group_admin_route">
+        <label name="route_oral"/>
+        <field name="route_oral"/>
+        <label name="route_inhaling"/>
+        <field name="route_inhaling"/>
+        <label name="route_popping"/>
+        <field name="route_popping"/>
+        <label name="route_sniffing"/>
+        <field name="route_sniffing"/>
+        <label name="route_injection"/>
+        <field name="route_injection"/>
+    </group>
+    <newline/>
+    <separator colspan="4" string="Additional Info and Effects" id="separator_additional_info"/>
+    <field name="info" colspan="4"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_lifestyle/view/gnuhealth_drugs_recreational_tree.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<tree string="Recreational Drugs">
+    <field name="name"/>
+    <field name="category"/>
+    <field name="toxicity"/>
+    <field name="addiction_level"/>
+    <field name="street_name"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_lifestyle/view/gnuhealth_patient.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0"?>
+<data>
+    <xpath expr="/form/notebook/page[@id=&quot;patient_diseases&quot;]" position="after">
+        <page string="Lifestyle" id="patient_lifestyle">
+            <notebook>
+                <page string="Diet and Exersice" id="diet_and_exercise">
+                    <group colspan="4" id="group_holder1">
+                        <group col="4" string="Physical Exercise" id="physical_exercise">
+                            <label name="exercise"/>
+                            <field name="exercise"/>
+                            <label name="exercise_minutes_day"/>
+                            <field name="exercise_minutes_day"/>
+                        </group>
+                        <group col="4" string="Sleep" id="group_sleep">
+                            <label name="sleep_hours"/>
+                            <field name="sleep_hours"/>
+                            <label name="sleep_during_daytime"/>
+                            <field name="sleep_during_daytime"/>
+                        </group>
+                        <newline/>
+                        <group colspan="4" col="8" id="group_diet">
+                            <label name="number_of_meals"/>
+                            <field name="number_of_meals"/>
+                            <label name="eats_alone"/>
+                            <field name="eats_alone"/>
+                            <label name="coffee"/>
+                            <field name="coffee"/>
+                            <label name="coffee_cups"/>
+                            <field name="coffee_cups"/>
+                            <label name="soft_drinks"/>
+                            <field name="soft_drinks"/>
+                            <label name="salt"/>
+                            <field name="salt"/>
+                            <label name="diet"/>
+                            <field name="diet"/>
+                            <label name="diet_info"/>
+                            <field name="diet_info"/>
+                        </group>
+                        <newline/>
+                        <group colspan="4" id="group_lifestyle">
+                            <field name="lifestyle_info"/>
+                        </group>
+                    </group>
+                </page>
+                <page string="Addictions" id="page_addictions">
+                    <notebook>
+                        <page string="Main" id="page_addictions_main">
+                            <group colspan="4" col="8" id="group_addictions_main">
+                                <label name="smoking"/>
+                                <field name="smoking"/>
+                                <label name="smoking_number"/>
+                                <field name="smoking_number"/>
+                                <label name="ex_smoker"/>
+                                <field name="ex_smoker"/>
+                                <label name="second_hand_smoker"/>
+                                <field name="second_hand_smoker"/>
+                                <label name="age_start_smoking"/>
+                                <field name="age_start_smoking"/>
+                                <label name="age_quit_smoking"/>
+                                <field name="age_quit_smoking"/>
+                                <label name="drug_usage"/>
+                                <field name="drug_usage"/>
+                                <label name="drug_iv"/>
+                                <field name="drug_iv"/>
+                                <label name="ex_drug_addict"/>
+                                <field name="ex_drug_addict"/>
+                                <label name="age_start_drugs"/>
+                                <field name="age_start_drugs"/>
+                                <label name="age_quit_drugs"/>
+                                <field name="age_quit_drugs"/>
+                            </group>
+                        </page>
+                        <page string="Alcohol" id="page_alchohol">
+                            <group colspan="2" id="group_alcohol">
+                                <label name="alcohol"/>
+                                <field name="alcohol"/>
+                                <label name="ex_alcoholic"/>
+                                <field name="ex_alcoholic"/>
+                                <label name="age_start_drinking"/>
+                                <field name="age_start_drinking"/>
+                                <label name="age_quit_drinking"/>
+                                <field name="age_quit_drinking"/>
+                                <label name="alcohol_beer_number"/>
+                                <field name="alcohol_beer_number"/>
+                                <label name="alcohol_wine_number"/>
+                                <field name="alcohol_wine_number"/>
+                                <label name="alcohol_liquor_number"/>
+                                <field name="alcohol_liquor_number"/>
+                            </group>
+                            <field name="cage"/>
+                        </page>
+                        <page string="Recreational Drugs" id="page_recreational_drugs">
+                            <field name="recreational_drugs"/>
+                        </page>
+                    </notebook>
+                </page>
+                <page string="Sexuality" id="page_sexuality">
+                    <group colspan="4" col="12" id="group_sexuality">
+                        <label name="sexual_preferences"/>
+                        <field name="sexual_preferences"/>
+                        <label name="sexual_partners"/>
+                        <field name="sexual_partners"/>
+                        <label name="sexual_partners_number"/>
+                        <field name="sexual_partners_number"/>
+                        <newline/>
+                        <label name="first_sexual_encounter"/>
+                        <field name="first_sexual_encounter"/>
+                        <label name="sexual_practices"/>
+                        <field name="sexual_practices"/>
+                        <label name="anticonceptive"/>
+                        <field name="anticonceptive"/>
+                    </group>
+                    <newline/>
+                    <group colspan="4" col="6" string="Sexual practices" id="group_other_sexual_practices">
+                        <group id="group_sexual_holder">
+                            <label name="sex_oral"/>
+                            <field name="sex_oral"/>
+                            <newline/>
+                            <label name="sex_anal"/>
+                            <field name="sex_anal"/>
+                        </group>
+                        <group id="group_prostitution">
+                            <label name="prostitute"/>
+                            <field name="prostitute"/>
+                            <newline/>
+                            <label name="sex_with_prostitutes"/>
+                            <field name="sex_with_prostitutes"/>
+                        </group>
+                        <group colspan="4" id="group_sexuality_notes">
+                            <field name="sexuality_info"/>
+                        </group>
+                    </group>
+                </page>
+                <page string="Safety" id="page_safety">
+                    <group colspan="4" col="6" string="Drive and Home Safety" id="group_drive_and_safety">
+                        <label name="motorcycle_rider"/>
+                        <field name="motorcycle_rider"/>
+                        <label name="helmet"/>
+                        <field name="helmet"/>
+                        <label name="traffic_laws"/>
+                        <field name="traffic_laws"/>
+                        <label name="car_revision"/>
+                        <field name="car_revision"/>
+                        <label name="car_seat_belt"/>
+                        <field name="car_seat_belt"/>
+                        <label name="car_child_safety"/>
+                        <field name="car_child_safety"/>
+                        <label name="home_safety"/>
+                        <field name="home_safety"/>
+                    </group>
+                </page>
+            </notebook>
+        </page>
+    </xpath>
+</data>
new file mode 100644
--- /dev/null
+++ b/tryton/health_lifestyle/view/gnuhealth_patient_cage.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<form string="Patient CAGE Questionnaire">
+    <field name="evaluation_date"/>
+    <field name="evaluation_date"/>
+    <label name="cage_c"/>
+    <field name="cage_c"/>
+    <label name="cage_a"/>
+    <field name="cage_a"/>
+    <label name="cage_g"/>
+    <field name="cage_g"/>
+    <label name="cage_e"/>
+    <field name="cage_e"/>
+    <label name="cage_score"/>
+    <field name="cage_score"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_lifestyle/view/gnuhealth_patient_cage_tree.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<tree editable="top" string="Patient CAGE SCORE" colors="If(Greater(Eval('cage_score',0), 1),'red','blue')">
+    <field name="evaluation_date"/>
+    <field name="cage_c"/>
+    <field name="cage_a"/>
+    <field name="cage_g"/>
+    <field name="cage_e"/>
+    <field name="cage_score"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_lifestyle/view/gnuhealth_recreational_drugs.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<form string="Patient Recreational Drugs">
+    <label name="patient"/>
+    <field name="patient"/>
+    <label name="recreational_drug"/>
+    <field name="recreational_drug"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_lifestyle/view/gnuhealth_recreational_drugs_tree.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<tree string="Patient Recreational Drugs">
+    <field name="patient"/>
+    <field name="recreational_drug" expand="1"/>
+</tree>
--- a/tryton/health_ntd_chagas/health_ntd_chagas_view.xml
+++ b/tryton/health_ntd_chagas/health_ntd_chagas_view.xml
@@ -7,96 +7,13 @@
         <record model="ir.ui.view" id="gnuhealth_chagas_du_survey_form">
             <field name="model">gnuhealth.chagas_du_survey</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Chagas Domiciliary Unit Entomological Survey">
-                    <group col="8" colspan="4" id="chagas_du_survey_header">
-                        <label name="name"/>
-                        <field name="name"/>
-                        <label name="du"/>
-                        <field name="du"/>
-                        <label name="survey_date"/>
-                        <field name="survey_date"/>
-                        <label name="du_status"/>
-                        <field name="du_status"/>
-
-                    </group>
-
-                    <newline/>
-
-                    <group colspan="4" id="chagas_du_status">
-
-                        <group col="10" string="Presence of triatomines" id="chagas_du_vectors">
-                            <label name="triatomines"/>
-                            <field name="triatomines"/>
-                            <label name="nymphs"/>
-                            <field name="nymphs"/>
-                            <label name="t_in_house"/>
-                            <field name="t_in_house"/>
-                            <label name="t_peri"/>
-                            <field name="t_peri"/>
-                            <label name="vector"/>
-                            <field name="vector"/>
-                            
-                        </group>
-
-                        <group string="Areas to Improve" colspan="4" col="8" id="chagas_du_deficit_areas">
-                            <label name="droof"/>
-                            <field name="droof"/>
-                            <label name="dwall"/>
-                            <field name="dwall"/>
-                            <label name="dfloor"/>
-                            <field name="dfloor"/>
-                            <label name="dperi"/>
-                            <field name="dperi"/>
-                        </group>
-
-                        <group string="Preventive Measures" colspan="4" col="8" id="chagas_du_preventive_measures">
-                            <label name="bugtraps"/>
-                            <field name="bugtraps"/>
-                            <newline/>
-                            <label name="du_fumigation"/>
-                            <field name="du_fumigation"/>
-                            <label name="fumigation_date"/>
-                            <field name="fumigation_date"/>
-                            <label name="du_paint"/>
-                            <field name="du_paint"/>
-                            <label name="paint_date"/>
-                            <field name="paint_date"/>
-                        </group>
-
-                    </group>
-
-                    <newline/>
-                    <separator string="Notes" id="sepatator_chagas_du_survey_notes"/>
-                    <newline/>
-                    <field name="observations" colspan="4"/>
-                    <newline/>
-                    <label name="next_survey_date"/>
-                    <field name="next_survey_date"/>
-
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_chagas_du_survey_form</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_chagas_du_survey_tree">
             <field name="model">gnuhealth.chagas_du_survey</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Chagas Domiciliary Unit Entomological Surveys">
-                    <field name="name" expand="1"/>
-                    <field name="du" expand="1" />
-                    <field name="triatomines" expand="1" />
-                    <field name="nymphs" expand="1" />
-                    <field name="du_fumigation" expand="1" />
-                    <field name="du_paint" expand="1" />
-                    <field name="survey_date"/>
-                    <field name="du_status"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_chagas_du_survey_tree</field>
         </record>
 
 
--- a/tryton/health_ntd_chagas/setup.py
+++ b/tryton/health_ntd_chagas/setup.py
@@ -59,7 +59,8 @@
     package_data={
         'trytond.modules.health_ntd_chagas': info.get('xml', []) \
             + info.get('translation', []) \
-            + ['tryton.cfg', 'doc/*.rst', 'locale/*.po', 'report/*.odt', 'icons/*.svg'],
+            + ['tryton.cfg', 'view/*.xml', 'doc/*.rst', 'locale/*.po',
+               'report/*.odt', 'icons/*.svg'],
         },
 
     classifiers=[
new file mode 100644
--- /dev/null
+++ b/tryton/health_ntd_chagas/view/gnuhealth_chagas_du_survey_form.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<form string="Chagas Domiciliary Unit Entomological Survey">
+    <group col="8" colspan="4" id="chagas_du_survey_header">
+        <label name="name"/>
+        <field name="name"/>
+        <label name="du"/>
+        <field name="du"/>
+        <label name="survey_date"/>
+        <field name="survey_date"/>
+        <label name="du_status"/>
+        <field name="du_status"/>
+    </group>
+    <newline/>
+    <group colspan="4" id="chagas_du_status">
+        <group col="10" string="Presence of triatomines" id="chagas_du_vectors">
+            <label name="triatomines"/>
+            <field name="triatomines"/>
+            <label name="nymphs"/>
+            <field name="nymphs"/>
+            <label name="t_in_house"/>
+            <field name="t_in_house"/>
+            <label name="t_peri"/>
+            <field name="t_peri"/>
+            <label name="vector"/>
+            <field name="vector"/>
+        </group>
+        <group string="Areas to Improve" colspan="4" col="8" id="chagas_du_deficit_areas">
+            <label name="droof"/>
+            <field name="droof"/>
+            <label name="dwall"/>
+            <field name="dwall"/>
+            <label name="dfloor"/>
+            <field name="dfloor"/>
+            <label name="dperi"/>
+            <field name="dperi"/>
+        </group>
+        <group string="Preventive Measures" colspan="4" col="8" id="chagas_du_preventive_measures">
+            <label name="bugtraps"/>
+            <field name="bugtraps"/>
+            <newline/>
+            <label name="du_fumigation"/>
+            <field name="du_fumigation"/>
+            <label name="fumigation_date"/>
+            <field name="fumigation_date"/>
+            <label name="du_paint"/>
+            <field name="du_paint"/>
+            <label name="paint_date"/>
+            <field name="paint_date"/>
+        </group>
+    </group>
+    <newline/>
+    <separator string="Notes" id="sepatator_chagas_du_survey_notes"/>
+    <newline/>
+    <field name="observations" colspan="4"/>
+    <newline/>
+    <label name="next_survey_date"/>
+    <field name="next_survey_date"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_ntd_chagas/view/gnuhealth_chagas_du_survey_tree.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<tree string="Chagas Domiciliary Unit Entomological Surveys">
+    <field name="name" expand="1"/>
+    <field name="du" expand="1"/>
+    <field name="triatomines" expand="1"/>
+    <field name="nymphs" expand="1"/>
+    <field name="du_fumigation" expand="1"/>
+    <field name="du_paint" expand="1"/>
+    <field name="survey_date"/>
+    <field name="du_status"/>
+</tree>
--- a/tryton/health_ntd_dengue/health_ntd_dengue_view.xml
+++ b/tryton/health_ntd_dengue/health_ntd_dengue_view.xml
@@ -7,90 +7,13 @@
         <record model="ir.ui.view" id="gnuhealth_dengue_du_survey_form">
             <field name="model">gnuhealth.dengue_du_survey</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Dengue Domiciliary Unit Entomological Survey">
-                    <group col="8" colspan="4" id="dengue_du_survey_header">
-                        <label name="name"/>
-                        <field name="name"/>
-                        <label name="du"/>
-                        <field name="du"/>
-                        <label name="survey_date"/>
-                        <field name="survey_date"/>
-                        <label name="du_status"/>
-                        <field name="du_status"/>
-
-                    </group>
-
-                    <newline/>
-
-                    <group colspan="4" id="dengue_du_status">
-
-                        <group col="10" string="Presence of larvae" id="dengue_du_vectors">
-                            <label name="aedes_larva"/>
-                            <field name="aedes_larva"/>
-                            <label name="larva_in_house"/>
-                            <field name="larva_in_house"/>
-                            <label name="larva_peri"/>
-                            <field name="larva_peri"/>
-                            
-                        </group>
-
-                        <group string="Areas to Improve" colspan="4" col="8" id="dengue_du_deficit_areas">
-                            <label name="old_tyres"/>
-                            <field name="old_tyres"/>
-                            <label name="animal_water_container"/>
-                            <field name="animal_water_container"/>
-                            <label name="flower_vase"/>
-                            <field name="flower_vase"/>
-                            <label name="potted_plant"/>
-                            <field name="potted_plant"/>
-                            <label name="tree_holes"/>
-                            <field name="tree_holes"/>
-                            <label name="rock_holes"/>
-                            <field name="rock_holes"/>
-                            
-                        </group>
-
-                        <group string="Preventive Measures" colspan="4" col="8" id="dengue_du_preventive_measures">
-                            <label name="ovitraps"/>
-                            <field name="ovitraps"/>
-                            <newline/>
-                            <label name="du_fumigation"/>
-                            <field name="du_fumigation"/>
-                            <label name="fumigation_date"/>
-                            <field name="fumigation_date"/>
-                        </group>
-
-                    </group>
-
-                    <newline/>
-                    <separator string="Notes" id="sepatator_dengue_du_survey_notes"/>
-                    <newline/>
-                    <field name="observations" colspan="4"/>
-                    <newline/>
-                    <label name="next_survey_date"/>
-                    <field name="next_survey_date"/>
-
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_dengue_du_survey_form</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_dengue_du_survey_tree">
             <field name="model">gnuhealth.dengue_du_survey</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Dengue Domiciliary Unit Entomological Surveys">
-                    <field name="name" expand="1"/>
-                    <field name="du" expand="1" />
-                    <field name="aedes_larva" expand="1" />
-                    <field name="survey_date"/>
-                    <field name="du_status"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_dengue_du_survey_tree</field>
         </record>
 
 
--- a/tryton/health_ntd_dengue/setup.py
+++ b/tryton/health_ntd_dengue/setup.py
@@ -59,7 +59,8 @@
     package_data={
         'trytond.modules.health_ntd_dengue': info.get('xml', []) \
             + info.get('translation', []) \
-            + ['tryton.cfg', 'doc/*.rst', 'locale/*.po', 'report/*.odt', 'icons/*.svg'],
+            + ['tryton.cfg', 'view/*.xml', 'doc/*.rst', 'locale/*.po',
+               'report/*.odt', 'icons/*.svg'],
         },
 
     classifiers=[
new file mode 100644
--- /dev/null
+++ b/tryton/health_ntd_dengue/view/gnuhealth_dengue_du_survey_form.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0"?>
+<form string="Dengue Domiciliary Unit Entomological Survey">
+    <group col="8" colspan="4" id="dengue_du_survey_header">
+        <label name="name"/>
+        <field name="name"/>
+        <label name="du"/>
+        <field name="du"/>
+        <label name="survey_date"/>
+        <field name="survey_date"/>
+        <label name="du_status"/>
+        <field name="du_status"/>
+    </group>
+    <newline/>
+    <group colspan="4" id="dengue_du_status">
+        <group col="10" string="Presence of larvae" id="dengue_du_vectors">
+            <label name="aedes_larva"/>
+            <field name="aedes_larva"/>
+            <label name="larva_in_house"/>
+            <field name="larva_in_house"/>
+            <label name="larva_peri"/>
+            <field name="larva_peri"/>
+        </group>
+        <group string="Areas to Improve" colspan="4" col="8" id="dengue_du_deficit_areas">
+            <label name="old_tyres"/>
+            <field name="old_tyres"/>
+            <label name="animal_water_container"/>
+            <field name="animal_water_container"/>
+            <label name="flower_vase"/>
+            <field name="flower_vase"/>
+            <label name="potted_plant"/>
+            <field name="potted_plant"/>
+            <label name="tree_holes"/>
+            <field name="tree_holes"/>
+            <label name="rock_holes"/>
+            <field name="rock_holes"/>
+        </group>
+        <group string="Preventive Measures" colspan="4" col="8" id="dengue_du_preventive_measures">
+            <label name="ovitraps"/>
+            <field name="ovitraps"/>
+            <newline/>
+            <label name="du_fumigation"/>
+            <field name="du_fumigation"/>
+            <label name="fumigation_date"/>
+            <field name="fumigation_date"/>
+        </group>
+    </group>
+    <newline/>
+    <separator string="Notes" id="sepatator_dengue_du_survey_notes"/>
+    <newline/>
+    <field name="observations" colspan="4"/>
+    <newline/>
+    <label name="next_survey_date"/>
+    <field name="next_survey_date"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_ntd_dengue/view/gnuhealth_dengue_du_survey_tree.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<tree string="Dengue Domiciliary Unit Entomological Surveys">
+    <field name="name" expand="1"/>
+    <field name="du" expand="1"/>
+    <field name="aedes_larva" expand="1"/>
+    <field name="survey_date"/>
+    <field name="du_status"/>
+</tree>
--- a/tryton/health_nursing/health_nursing_view.xml
+++ b/tryton/health_nursing/health_nursing_view.xml
@@ -18,31 +18,13 @@
         <record model="ir.ui.view" id="gnuhealth_rounding_view">
             <field name="model">gnuhealth.rounding_procedure</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Rounding Procedure">
-                    <label name="procedure"/>
-                    <field name="procedure"/>
-                    <newline/>
-                    <separator string="Procedure Details / Incidents" colspan="4" id="separator_procedure_details"/>
-                    <newline/>
-                    <field name="notes" colspan="4"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_rounding</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_procedure_tree">
             <field name="model">gnuhealth.rounding_procedure</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string='Rounding Procedure'>
-                    <field name="procedure"/>
-                    <field name="notes"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_procedure_tree</field>
         </record>
         
 <!-- Rounding view -->
@@ -50,104 +32,13 @@
         <record model="ir.ui.view" id="gnuhealth_patient_rounding_view">
             <field name="model">gnuhealth.patient.rounding</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Patient Rounding View">
-                    <notebook>
-                        <page string="Main" id="rounding_main">
-                            <group colspan="2" id="group_admin_data">
-                                <label name="name"/>
-                                <field name="name"/>
-                                <label name="health_professional"/>
-                                <field name="health_professional"/>
-                                <label name="evaluation_start"/>
-                                <field name="evaluation_start"/>
-                                <label name="evaluation_end"/>
-                                <field name="evaluation_end"/>
-                                <label name="environmental_assessment"/>
-                                <field name="environmental_assessment"/>
-                                <label name="warning"/>
-                                <field name="warning"/>
-                            </group>
-
-                            <newline/>
-
-                            <group colspan="4" col="6" id="the_six_p_wiew" string="Six P's">
-                                <label name="pain"/>
-                                <field name="pain"/>
-                                <label name="potty"/>
-                                <field name="potty"/>
-                                <label name="position"/>
-                                <field name="position"/>
-                                <label name="proximity"/>
-                                <field name="proximity"/>
-                                <label name="pump"/>
-                                <field name="pump"/>
-                                <label name="personal_needs"/>
-                                <field name="personal_needs"/>
-                            </group>
-
-                            <newline/>
-
-                            <group colspan="4" col="6" string="Vital Signs" id="group_patient_rounding_vital_signs">
-                                <label name="temperature"/>
-                                <field name="temperature"/>
-                                <label name="systolic"/>
-                                <field name="systolic"/>
-                                <label name="diastolic"/>
-                                <field name="diastolic"/>
-                                <label name="bpm"/>
-                                <field name="bpm"/>
-                                <label name="respiratory_rate"/>
-                                <field name="respiratory_rate"/>
-                                <label name="osat"/>
-                                <field name="osat"/>
-                            </group>
-
-                            <newline/>
-
-                            <group colspan="4" col="10" id="group_patient_rounding_others" string="Other">
-                                <label name="diuresis"/>
-                                <field name="diuresis"/>
-                                <label name="urinary_catheter"/>
-                                <field name="urinary_catheter"/>
-                                <label name="glycemia"/>
-                                <field name="glycemia"/>
-                                <label name="depression"/>
-                                <field name="depression"/>
-                                <label name="evolution"/>
-                                <field name="evolution"/>
-                            </group>
-                            <newline/>
-                            <separator string="Round summary" id="separator_round_summary"/>
-                            <newline/>
-                            
-                            <field name="round_summary"/>
-                        </page>
-                        <page string="Procedures" id="rounding_procedures">
-                            <field name="procedures"/>
-                        </page>
-                    </notebook>
-                </form>
-                ]]>
-
-            </field>
+            <field name="name">gnuhealth_patient_rounding</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_patient_rounding_tree">
             <field name="model">gnuhealth.patient.rounding</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Roundings" colors="If(Bool(Eval('warning')),'red','black')">
-                    <field name="warning"/>
-                    <field name="name" expand="1"/>
-                    <field name="evaluation_start" expand="1"/>
-                    <field name="health_professional" expand="1"/>
-                    <field name="evolution" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_patient_rounding_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="action_gnuhealth_patient_rounding_view">
@@ -177,31 +68,13 @@
         <record model="ir.ui.view" id="gnuhealth_ambulatory_care_view">
             <field name="model">gnuhealth.ambulatory_care_procedure</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Procedures">
-                    <label name="procedure"/>
-                    <field name="procedure"/>
-                    <newline/>
-                    <separator string="Procedure Details / Incidents" colspan="4" id="separator_procedure_details"/>
-                    <newline/>
-                    <field name="comments" colspan="4"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_ambulatory_care</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_ambulatory_procedure_tree">
             <field name="model">gnuhealth.ambulatory_care_procedure</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string='Ambulatory Procedure'>
-                    <field name="procedure"/>
-                    <field name="comments"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_ambulatory_procedure_tree</field>
         </record>
         
 <!-- Outpatient Care view -->
@@ -209,101 +82,13 @@
         <record model="ir.ui.view" id="gnuhealth_patient_ambulatory_care_view">
             <field name="model">gnuhealth.patient.ambulatory_care</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Patient Ambulatory Care">
-                    <notebook>
-                        <page string="Main" id="ambulatory_care_main">
-                            <group colspan="4" id="ambulatory_care_main_data">
-                                <label name="name"/>
-                                <field name="name"/>
-                                <label name="health_professional"/>
-                                <field name="health_professional"/>
-                                <label name="ordering_professional"/>
-                                <field name="ordering_professional"/>
-                                <label name="patient"/>
-                                <field name="patient"/>
-                                <label name="base_condition"/>
-                                <field name="base_condition"/>
-                                <label name="evaluation"/>
-                                <field name="evaluation"/>
-                                <label name="session_number"/>
-                                <field name="session_number"/>
-                                <label name="session_start"/>
-                                <field name="session_start"/>
-                            </group>
-
-                            <newline/>
-
-                            <field colspan="4" name="procedures"/>
-
-                            <newline/>
-                            <separator colspan="4" string="Summary" id="separator_round_summary"/>
-                            <newline/>
-                            
-                            <field colspan="4" name="session_notes"/>
-                            <newline/>
-
-                            <group colspan="4" col="6" id="ambulatory_care_finish">
-
-                            <label name="warning"/>
-                            <field name="warning"/>
-                            
-                            <label name="session_end"/>
-                            <field name="session_end"/>
-
-                            <label name="next_session"/>
-                            <field name="next_session"/>
-                            </group>
-                            
-                        </page>
-                        <page string="Other" id="ambulatory_care_other_information">
-                            <group colspan="4" col="6" string="Vital Signs" id="group_ambulatory_care_vital_signs">
-                                <label name="temperature"/>
-                                <field name="temperature"/>
-                                <label name="systolic"/>
-                                <field name="systolic"/>
-                                <label name="diastolic"/>
-                                <field name="diastolic"/>
-                                <label name="bpm"/>
-                                <field name="bpm"/>
-                                <label name="respiratory_rate"/>
-                                <field name="respiratory_rate"/>
-                                <label name="osat"/>
-                                <field name="osat"/>
-                            </group>
-                            <newline/>
-
-                            <group colspan="4" col="6" id="group_patient_care_others" string="Other">
-                                <label name="glycemia"/>
-                                <field name="glycemia"/>
-                                <label name="evolution"/>
-                                <field name="evolution"/>
-                            </group>
-
-                        </page>
-                    </notebook>
-                </form>
-                ]]>
-
-            </field>
+            <field name="name">gnuhealth_patient_ambulatory_care</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_patient_ambulatory_care_tree">
             <field name="model">gnuhealth.patient.ambulatory_care</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Ambulatory Sessions" colors="If(Bool(Eval('warning')),'red','black')">
-                    <field name="warning"/>
-                    <field name="name" expand="1"/>
-                    <field name="patient" expand="1"/>                    
-                    <field name="session_start" expand="1"/>
-                    <field name="health_professional" expand="1"/>
-                    <field name="evolution" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_patient_ambulatory_care_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="action_gnuhealth_patient_ambulatory_care_view">
--- a/tryton/health_nursing/setup.py
+++ b/tryton/health_nursing/setup.py
@@ -60,7 +60,8 @@
     package_data={
         'trytond.modules.health_nursing': info.get('xml', []) \
             + info.get('translation', []) \
-            + ['tryton.cfg', 'doc/*.rst', 'locale/*.po', 'report/*.odt', 'icons/*.svg'],
+            + ['tryton.cfg', 'view/*.xml', 'doc/*.rst', 'locale/*.po',
+               'report/*.odt', 'icons/*.svg'],
         },
 
     classifiers=[
new file mode 100644
--- /dev/null
+++ b/tryton/health_nursing/view/gnuhealth_ambulatory_care.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<form string="Procedures">
+    <label name="procedure"/>
+    <field name="procedure"/>
+    <newline/>
+    <separator string="Procedure Details / Incidents" colspan="4" id="separator_procedure_details"/>
+    <newline/>
+    <field name="comments" colspan="4"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_nursing/view/gnuhealth_ambulatory_procedure_tree.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<tree string="Ambulatory Procedure">
+    <field name="procedure"/>
+    <field name="comments"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_nursing/view/gnuhealth_patient_ambulatory_care.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0"?>
+<form string="Patient Ambulatory Care">
+    <notebook>
+        <page string="Main" id="ambulatory_care_main">
+            <group colspan="4" id="ambulatory_care_main_data">
+                <label name="name"/>
+                <field name="name"/>
+                <label name="health_professional"/>
+                <field name="health_professional"/>
+                <label name="ordering_professional"/>
+                <field name="ordering_professional"/>
+                <label name="patient"/>
+                <field name="patient"/>
+                <label name="base_condition"/>
+                <field name="base_condition"/>
+                <label name="evaluation"/>
+                <field name="evaluation"/>
+                <label name="session_number"/>
+                <field name="session_number"/>
+                <label name="session_start"/>
+                <field name="session_start"/>
+            </group>
+            <newline/>
+            <field colspan="4" name="procedures"/>
+            <newline/>
+            <separator colspan="4" string="Summary" id="separator_round_summary"/>
+            <newline/>
+            <field colspan="4" name="session_notes"/>
+            <newline/>
+            <group colspan="4" col="6" id="ambulatory_care_finish">
+                <label name="warning"/>
+                <field name="warning"/>
+                <label name="session_end"/>
+                <field name="session_end"/>
+                <label name="next_session"/>
+                <field name="next_session"/>
+            </group>
+        </page>
+        <page string="Other" id="ambulatory_care_other_information">
+            <group colspan="4" col="6" string="Vital Signs" id="group_ambulatory_care_vital_signs">
+                <label name="temperature"/>
+                <field name="temperature"/>
+                <label name="systolic"/>
+                <field name="systolic"/>
+                <label name="diastolic"/>
+                <field name="diastolic"/>
+                <label name="bpm"/>
+                <field name="bpm"/>
+                <label name="respiratory_rate"/>
+                <field name="respiratory_rate"/>
+                <label name="osat"/>
+                <field name="osat"/>
+            </group>
+            <newline/>
+            <group colspan="4" col="6" id="group_patient_care_others" string="Other">
+                <label name="glycemia"/>
+                <field name="glycemia"/>
+                <label name="evolution"/>
+                <field name="evolution"/>
+            </group>
+        </page>
+    </notebook>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_nursing/view/gnuhealth_patient_ambulatory_care_tree.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<tree string="Ambulatory Sessions" colors="If(Bool(Eval('warning')),'red','black')">
+    <field name="warning"/>
+    <field name="name" expand="1"/>
+    <field name="patient" expand="1"/>
+    <field name="session_start" expand="1"/>
+    <field name="health_professional" expand="1"/>
+    <field name="evolution" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_nursing/view/gnuhealth_patient_rounding.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+<form string="Patient Rounding View">
+    <notebook>
+        <page string="Main" id="rounding_main">
+            <group colspan="2" id="group_admin_data">
+                <label name="name"/>
+                <field name="name"/>
+                <label name="health_professional"/>
+                <field name="health_professional"/>
+                <label name="evaluation_start"/>
+                <field name="evaluation_start"/>
+                <label name="evaluation_end"/>
+                <field name="evaluation_end"/>
+                <label name="environmental_assessment"/>
+                <field name="environmental_assessment"/>
+                <label name="warning"/>
+                <field name="warning"/>
+            </group>
+            <newline/>
+            <group colspan="4" col="6" id="the_six_p_wiew" string="Six P's">
+                <label name="pain"/>
+                <field name="pain"/>
+                <label name="potty"/>
+                <field name="potty"/>
+                <label name="position"/>
+                <field name="position"/>
+                <label name="proximity"/>
+                <field name="proximity"/>
+                <label name="pump"/>
+                <field name="pump"/>
+                <label name="personal_needs"/>
+                <field name="personal_needs"/>
+            </group>
+            <newline/>
+            <group colspan="4" col="6" string="Vital Signs" id="group_patient_rounding_vital_signs">
+                <label name="temperature"/>
+                <field name="temperature"/>
+                <label name="systolic"/>
+                <field name="systolic"/>
+                <label name="diastolic"/>
+                <field name="diastolic"/>
+                <label name="bpm"/>
+                <field name="bpm"/>
+                <label name="respiratory_rate"/>
+                <field name="respiratory_rate"/>
+                <label name="osat"/>
+                <field name="osat"/>
+            </group>
+            <newline/>
+            <group colspan="4" col="10" id="group_patient_rounding_others" string="Other">
+                <label name="diuresis"/>
+                <field name="diuresis"/>
+                <label name="urinary_catheter"/>
+                <field name="urinary_catheter"/>
+                <label name="glycemia"/>
+                <field name="glycemia"/>
+                <label name="depression"/>
+                <field name="depression"/>
+                <label name="evolution"/>
+                <field name="evolution"/>
+            </group>
+            <newline/>
+            <separator string="Round summary" id="separator_round_summary"/>
+            <newline/>
+            <field name="round_summary"/>
+        </page>
+        <page string="Procedures" id="rounding_procedures">
+            <field name="procedures"/>
+        </page>
+    </notebook>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_nursing/view/gnuhealth_patient_rounding_tree.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<tree string="Roundings" colors="If(Bool(Eval('warning')),'red','black')">
+    <field name="warning"/>
+    <field name="name" expand="1"/>
+    <field name="evaluation_start" expand="1"/>
+    <field name="health_professional" expand="1"/>
+    <field name="evolution" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_nursing/view/gnuhealth_procedure_tree.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<tree string="Rounding Procedure">
+    <field name="procedure"/>
+    <field name="notes"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_nursing/view/gnuhealth_rounding.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<form string="Rounding Procedure">
+    <label name="procedure"/>
+    <field name="procedure"/>
+    <newline/>
+    <separator string="Procedure Details / Incidents" colspan="4" id="separator_procedure_details"/>
+    <newline/>
+    <field name="notes" colspan="4"/>
+</form>
--- a/tryton/health_pediatrics/health_pediatrics_view.xml
+++ b/tryton/health_pediatrics/health_pediatrics_view.xml
@@ -23,100 +23,7 @@
         <record model="ir.ui.view" id="gnuhealth_pediatric_symptoms_checklist_view">
             <field name="model">gnuhealth.patient.psc</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Pediatric Symptoms Checklist - PSC">
-                    <group colspan="4" id="group_psc1">
-                        <group colspan="4" col="10" id="group_psc_header">
-                            <label name="patient"/>
-                            <field name="patient"/>
-                            <label name="evaluation_start"/>
-                            <field name="evaluation_start"/>
-<!--
-                            <label name="evaluation_end"/>
-                            <field name="evaluation_end"/>
--->
-                            <label name="evaluation_date"/>
-                            <field name="evaluation_date"/>
-
-                            <label name="psc_total"/>
-                            <field name="psc_total"/>
-                        </group>
-                        <newline/>
-                        <separator colspan="4" id="separator_psc1"/>
-                        <newline/>
-                        <label name="psc_aches_pains"/>
-                        <field name="psc_aches_pains"/>
-                        <label name="psc_spend_time_alone"/>
-                        <field name="psc_spend_time_alone"/>
-                        <label name="psc_tires_easily"/>
-                        <field name="psc_tires_easily"/>
-                        <label name="psc_fidgety"/>
-                        <field name="psc_fidgety"/>
-                        <label name="psc_trouble_with_teacher"/>
-                        <field name="psc_trouble_with_teacher"/>
-                        <label name="psc_less_interest_in_school"/>
-                        <field name="psc_less_interest_in_school"/>
-                        <label name="psc_acts_as_driven_by_motor"/>
-                        <field name="psc_acts_as_driven_by_motor"/>
-                        <label name="psc_daydreams_too_much"/>
-                        <field name="psc_daydreams_too_much"/>
-                        <label name="psc_distracted_easily"/>
-                        <field name="psc_distracted_easily"/>
-                        <label name="psc_afraid_of_new_situations"/>
-                        <field name="psc_afraid_of_new_situations"/>
-                        <label name="psc_sad_unhappy"/>
-                        <field name="psc_sad_unhappy"/>
-                        <label name="psc_irritable_angry"/>
-                        <field name="psc_irritable_angry"/>
-                        <label name="psc_feels_hopeless"/>
-                        <field name="psc_feels_hopeless"/>
-                        <label name="psc_trouble_concentrating"/>
-                        <field name="psc_trouble_concentrating"/>
-                        <label name="psc_less_interested_in_friends"/>
-                        <field name="psc_less_interested_in_friends"/>
-                        <label name="psc_fights_with_others"/>
-                        <field name="psc_fights_with_others"/>
-                        <label name="psc_absent_from_school"/>
-                        <field name="psc_absent_from_school"/>
-                        <label name="psc_school_grades_dropping"/>
-                        <field name="psc_school_grades_dropping"/>
-                        <label name="psc_down_on_self"/>
-                        <field name="psc_down_on_self"/>
-                        <label name="psc_visit_doctor_finds_ok"/>
-                        <field name="psc_visit_doctor_finds_ok"/>
-                        <label name="psc_trouble_sleeping"/>
-                        <field name="psc_trouble_sleeping"/>
-                        <label name="psc_worries_a_lot"/>
-                        <field name="psc_worries_a_lot"/>
-                        <label name="psc_wants_to_be_with_parents"/>
-                        <field name="psc_wants_to_be_with_parents"/>
-                        <label name="psc_feels_is_bad_child"/>
-                        <field name="psc_feels_is_bad_child"/>
-                        <label name="psc_takes_unnecesary_risks"/>
-                        <field name="psc_takes_unnecesary_risks"/>
-                        <label name="psc_gets_hurt_often"/>
-                        <field name="psc_gets_hurt_often"/>
-                        <label name="psc_having_less_fun"/>
-                        <field name="psc_having_less_fun"/>
-                        <label name="psc_act_as_younger"/>
-                        <field name="psc_act_as_younger"/>
-                        <label name="psc_does_not_listen_to_rules"/>
-                        <field name="psc_does_not_listen_to_rules"/>
-                        <label name="psc_does_not_show_feelings"/>
-                        <field name="psc_does_not_show_feelings"/>
-                        <label name="psc_does_not_get_people_feelings"/>
-                        <field name="psc_does_not_get_people_feelings"/>
-                        <label name="psc_teases_others"/>
-                        <field name="psc_teases_others"/>
-                        <label name="psc_takes_things_from_others"/>
-                        <field name="psc_takes_things_from_others"/>
-                        <label name="psc_refuses_to_share"/>
-                        <field name="psc_refuses_to_share"/>
-                    </group>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_pediatric_symptoms_checklist</field>
         </record>
 
 <!-- Tree view for PSC -->
@@ -124,15 +31,7 @@
         <record model="ir.ui.view" id="gnuhealth_pediatric_symptoms_checklist_tree">
             <field name="model">gnuhealth.patient.psc</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="PSC - Pediatric Symptoms Checklist History" colors = "If(Greater(Eval('psc_total',0), 27),'red','blue')">
-                    <field name="patient"/>
-                    <field name="evaluation_start"/>
-                    <field name="psc_total"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_pediatric_symptoms_checklist_tree</field>
         </record>
 
 <!-- Add the Pediatric Symptoms Checklist to the Patient form -->
@@ -202,47 +101,13 @@
         <record model="ir.ui.view" id="gnuhealth_neonatal_apgar_view">
             <field name="model">gnuhealth.neonatal.apgar</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="APGAR Score">
-                    <group colspan="4" string="APGAR" id="group_newborn_apgar">
-                        <label name="apgar_minute"/>
-                        <field name="apgar_minute"/>
-                        <label name="apgar_score"/>
-                        <field name="apgar_score"/>
-                        <newline/>
-                        <label name="apgar_appearance"/>
-                        <field name="apgar_appearance"/>
-                        <label name="apgar_pulse"/>
-                        <field name="apgar_pulse"/>
-                        <label name="apgar_grimace"/>
-                        <field name="apgar_grimace"/>
-                        <label name="apgar_activity"/>
-                        <field name="apgar_activity"/>
-                        <label name="apgar_respiration"/>
-                        <field name="apgar_respiration"/>
-                    </group>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_neonatal_apgar</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_neonatal_apgar_tree">
             <field name="model">gnuhealth.neonatal.apgar</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree>
-                    <field name="apgar_minute"/>
-                    <field name="apgar_score"/>
-                    <field name="apgar_appearance"/>
-                    <field name="apgar_pulse"/>
-                    <field name="apgar_grimace"/>
-                    <field name="apgar_activity"/>
-                    <field name="apgar_respiration"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_neonatal_apgar_tree</field>
         </record>
 
 <!-- Newborn -->
@@ -250,169 +115,13 @@
         <record model="ir.ui.view" id="gnuhealth_newborn_view">
             <field name="model">gnuhealth.newborn</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Newborn Info">
-                    <notebook>
-
-                        <page string="Main" id="page_newborn_main">
-                            <group string="Main" id="group_newborn_main">
-                                <group id="group_newborn_1">
-                                    <label name="name"/>
-                                    <field name="name"/>
-                                    <label name="newborn_name"/>
-                                    <field name="newborn_name"/>
-                                    <label name="mother"/>
-                                    <field name="mother"/>
-                                    <label name="sex"/>
-                                    <field name="sex"/>
-                                    <label name="birth_date"/>
-                                    <field name="birth_date"/>
-                                    <label name="dismissed"/>
-                                    <field name="dismissed"/>
-                                    <label name="length"/>
-                                    <field name="length"/>
-                                    <label name="weight"/>
-                                    <field name="weight"/>
-                                    <label name="cephalic_perimeter"/>
-                                    <field name="cephalic_perimeter"/>
-                                    <label name="responsible"/>
-                                    <field name="responsible"/>
-                                </group>
-                                <group id="group_newborn_photo">
-                                    <field name="photo" widget="image"/>
-                                </group>
-                            </group>
-                            <newline/>
-                            <field name="apgar_scores"/>
-                            <newline/>
-                            <group id="group_newborn_reanimation_holder">
-                                <group colspan="3" col="10" id="group_newborn_reanimation">
-                                    <label name="reanimation_stimulation"/>
-                                    <field name="reanimation_stimulation"/>
-                                    <label name="reanimation_aspiration"/>
-                                    <field name="reanimation_aspiration"/>
-                                    <label name="reanimation_intubation"/>
-                                    <field name="reanimation_intubation"/>
-                                    <label name="reanimation_mask"/>
-                                    <field name="reanimation_mask"/>
-                                    <label name="reanimation_oxygen"/>
-                                    <field name="reanimation_oxygen"/>
-
-                                </group>
-                                <group string="Notes" colspan="3" id="group_newborn_notes">
-                                    <field colspan="3" name="notes"/>
-                                </group>
-                            </group>
-                            <newline/>
-                        </page>
-
-                        <page string="Findings and Tests" id="page_newborn_findings">
-                            <group string="Neonatal Signs and Symptoms" colspan="4" col="8" id="group_neonatal_signs">
-                                <label name="meconium"/>
-                                <field name="meconium"/>
-                                <label name="neonatal_ortolani"/>
-                                <field name="neonatal_ortolani"/>
-                                <label name="neonatal_barlow"/>
-                                <field name="neonatal_barlow"/>
-                                <label name="neonatal_hernia"/>
-                                <field name="neonatal_hernia"/>
-                                <label name="neonatal_ambiguous_genitalia"/>
-                                <field name="neonatal_ambiguous_genitalia"/>
-                                <label name="neonatal_erbs_palsy"/>
-                                <field name="neonatal_erbs_palsy"/>
-                                <label name="neonatal_hematoma"/>
-                                <field name="neonatal_hematoma"/>
-                                <label name="neonatal_talipes_equinovarus"/>
-                                <field name="neonatal_talipes_equinovarus"/>
-                                <label name="neonatal_palmar_crease"/>
-                                <field name="neonatal_palmar_crease"/>
-                                <label name="neonatal_polydactyly"/>
-                                <field name="neonatal_polydactyly"/>
-                                <label name="neonatal_syndactyly"/>
-                                <field name="neonatal_syndactyly"/>
-                            </group>
-                            <newline/>
-                            <group string="Neonatal Reflex Check" colspan="4" col="8" id="group_neonatal_reflexes">
-                                <label name="neonatal_moro_reflex"/>
-                                <field name="neonatal_moro_reflex"/>
-                                <label name="neonatal_grasp_reflex"/>
-                                <field name="neonatal_grasp_reflex"/>
-                                <label name="neonatal_stepping_reflex"/>
-                                <field name="neonatal_stepping_reflex"/>
-                                <label name="neonatal_babinski_reflex"/>
-                                <field name="neonatal_babinski_reflex"/>
-                                <label name="neonatal_blink_reflex"/>
-                                <field name="neonatal_blink_reflex"/>
-                                <label name="neonatal_sucking_reflex"/>
-                                <field name="neonatal_sucking_reflex"/>
-                                <label name="neonatal_swimming_reflex"/>
-                                <field name="neonatal_swimming_reflex"/>
-                                <label name="neonatal_tonic_neck_reflex"/>
-                                <field name="neonatal_tonic_neck_reflex"/>
-                            </group>
-                            <newline/>
-                            <field name="congenital_diseases"/>
-                            <field name="medication"/>
-                            <newline/>
-                            <group colspan="4" col="6" string="Tests" id="group_newborn_tests">
-                                <label name="test_vdrl"/>
-                                <field name="test_vdrl"/>
-                                <label name="test_toxo"/>
-                                <field name="test_toxo"/>
-                                <label name="test_chagas"/>
-                                <field name="test_chagas"/>
-                                <label name="test_billirubin"/>
-                                <field name="test_billirubin"/>
-                                <label name="test_audition"/>
-                                <field name="test_audition"/>
-                                <label name="test_metabolic"/>
-                                <field name="test_metabolic"/>
-                            </group>
-
-                        </page>
-
-                        <page string="Other" id="page_newborn_other">
-                            <group string="Deceased" id="group_newborn_deceased">
-                                <group id="group_newborn_deceased_1">
-                                    <label name="bd"/>
-                                    <field name="bd"/>
-                                    <label name="died_at_delivery"/>
-                                    <field name="died_at_delivery"/>
-                                    <label name="died_at_the_hospital"/>
-                                    <field name="died_at_the_hospital"/>
-                                    <label name="died_being_transferred"/>
-                                    <field name="died_being_transferred"/>
-                                    <label name="tod"/>
-                                    <field name="tod"/>
-                                    <label name="cod"/>
-                                    <field name="cod"/>
-                                </group>
-                            </group>
-                        </page>
-
-                    </notebook>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_newborn</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_newborn_tree">
             <field name="model">gnuhealth.newborn</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Newborn Information">
-                    <field name="name"/>
-                    <field name="newborn_name"/>
-                    <field name="mother"/>
-                    <field name="birth_date"/>
-                    <field name="sex"/>
-                    <field name="length"/>
-                    <field name="weight"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_newborn_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="gnuhealth_action_newborn">
--- a/tryton/health_pediatrics/setup.py
+++ b/tryton/health_pediatrics/setup.py
@@ -61,7 +61,8 @@
     package_data={
         'trytond.modules.health_pediatrics': info.get('xml', []) \
             + info.get('translation', []) \
-            + ['tryton.cfg', 'doc/*.rst', 'locale/*.po', 'report/*.odt', 'icons/*.svg'],
+            + ['tryton.cfg', 'view/*.xml', 'doc/*.rst', 'locale/*.po',
+               'report/*.odt', 'icons/*.svg'],
         },
 
     classifiers=[
new file mode 100644
--- /dev/null
+++ b/tryton/health_pediatrics/view/gnuhealth_neonatal_apgar.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<form string="APGAR Score">
+    <group colspan="4" string="APGAR" id="group_newborn_apgar">
+        <label name="apgar_minute"/>
+        <field name="apgar_minute"/>
+        <label name="apgar_score"/>
+        <field name="apgar_score"/>
+        <newline/>
+        <label name="apgar_appearance"/>
+        <field name="apgar_appearance"/>
+        <label name="apgar_pulse"/>
+        <field name="apgar_pulse"/>
+        <label name="apgar_grimace"/>
+        <field name="apgar_grimace"/>
+        <label name="apgar_activity"/>
+        <field name="apgar_activity"/>
+        <label name="apgar_respiration"/>
+        <field name="apgar_respiration"/>
+    </group>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_pediatrics/view/gnuhealth_neonatal_apgar_tree.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<tree>
+    <field name="apgar_minute"/>
+    <field name="apgar_score"/>
+    <field name="apgar_appearance"/>
+    <field name="apgar_pulse"/>
+    <field name="apgar_grimace"/>
+    <field name="apgar_activity"/>
+    <field name="apgar_respiration"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_pediatrics/view/gnuhealth_newborn.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0"?>
+<form string="Newborn Info">
+    <notebook>
+        <page string="Main" id="page_newborn_main">
+            <group string="Main" id="group_newborn_main">
+                <group id="group_newborn_1">
+                    <label name="name"/>
+                    <field name="name"/>
+                    <label name="newborn_name"/>
+                    <field name="newborn_name"/>
+                    <label name="mother"/>
+                    <field name="mother"/>
+                    <label name="sex"/>
+                    <field name="sex"/>
+                    <label name="birth_date"/>
+                    <field name="birth_date"/>
+                    <label name="dismissed"/>
+                    <field name="dismissed"/>
+                    <label name="length"/>
+                    <field name="length"/>
+                    <label name="weight"/>
+                    <field name="weight"/>
+                    <label name="cephalic_perimeter"/>
+                    <field name="cephalic_perimeter"/>
+                    <label name="responsible"/>
+                    <field name="responsible"/>
+                </group>
+                <group id="group_newborn_photo">
+                    <field name="photo" widget="image"/>
+                </group>
+            </group>
+            <newline/>
+            <field name="apgar_scores"/>
+            <newline/>
+            <group id="group_newborn_reanimation_holder">
+                <group colspan="3" col="10" id="group_newborn_reanimation">
+                    <label name="reanimation_stimulation"/>
+                    <field name="reanimation_stimulation"/>
+                    <label name="reanimation_aspiration"/>
+                    <field name="reanimation_aspiration"/>
+                    <label name="reanimation_intubation"/>
+                    <field name="reanimation_intubation"/>
+                    <label name="reanimation_mask"/>
+                    <field name="reanimation_mask"/>
+                    <label name="reanimation_oxygen"/>
+                    <field name="reanimation_oxygen"/>
+                </group>
+                <group string="Notes" colspan="3" id="group_newborn_notes">
+                    <field colspan="3" name="notes"/>
+                </group>
+            </group>
+            <newline/>
+        </page>
+        <page string="Findings and Tests" id="page_newborn_findings">
+            <group string="Neonatal Signs and Symptoms" colspan="4" col="8" id="group_neonatal_signs">
+                <label name="meconium"/>
+                <field name="meconium"/>
+                <label name="neonatal_ortolani"/>
+                <field name="neonatal_ortolani"/>
+                <label name="neonatal_barlow"/>
+                <field name="neonatal_barlow"/>
+                <label name="neonatal_hernia"/>
+                <field name="neonatal_hernia"/>
+                <label name="neonatal_ambiguous_genitalia"/>
+                <field name="neonatal_ambiguous_genitalia"/>
+                <label name="neonatal_erbs_palsy"/>
+                <field name="neonatal_erbs_palsy"/>
+                <label name="neonatal_hematoma"/>
+                <field name="neonatal_hematoma"/>
+                <label name="neonatal_talipes_equinovarus"/>
+                <field name="neonatal_talipes_equinovarus"/>
+                <label name="neonatal_palmar_crease"/>
+                <field name="neonatal_palmar_crease"/>
+                <label name="neonatal_polydactyly"/>
+                <field name="neonatal_polydactyly"/>
+                <label name="neonatal_syndactyly"/>
+                <field name="neonatal_syndactyly"/>
+            </group>
+            <newline/>
+            <group string="Neonatal Reflex Check" colspan="4" col="8" id="group_neonatal_reflexes">
+                <label name="neonatal_moro_reflex"/>
+                <field name="neonatal_moro_reflex"/>
+                <label name="neonatal_grasp_reflex"/>
+                <field name="neonatal_grasp_reflex"/>
+                <label name="neonatal_stepping_reflex"/>
+                <field name="neonatal_stepping_reflex"/>
+                <label name="neonatal_babinski_reflex"/>
+                <field name="neonatal_babinski_reflex"/>
+                <label name="neonatal_blink_reflex"/>
+                <field name="neonatal_blink_reflex"/>
+                <label name="neonatal_sucking_reflex"/>
+                <field name="neonatal_sucking_reflex"/>
+                <label name="neonatal_swimming_reflex"/>
+                <field name="neonatal_swimming_reflex"/>
+                <label name="neonatal_tonic_neck_reflex"/>
+                <field name="neonatal_tonic_neck_reflex"/>
+            </group>
+            <newline/>
+            <field name="congenital_diseases"/>
+            <field name="medication"/>
+            <newline/>
+            <group colspan="4" col="6" string="Tests" id="group_newborn_tests">
+                <label name="test_vdrl"/>
+                <field name="test_vdrl"/>
+                <label name="test_toxo"/>
+                <field name="test_toxo"/>
+                <label name="test_chagas"/>
+                <field name="test_chagas"/>
+                <label name="test_billirubin"/>
+                <field name="test_billirubin"/>
+                <label name="test_audition"/>
+                <field name="test_audition"/>
+                <label name="test_metabolic"/>
+                <field name="test_metabolic"/>
+            </group>
+        </page>
+        <page string="Other" id="page_newborn_other">
+            <group string="Deceased" id="group_newborn_deceased">
+                <group id="group_newborn_deceased_1">
+                    <label name="bd"/>
+                    <field name="bd"/>
+                    <label name="died_at_delivery"/>
+                    <field name="died_at_delivery"/>
+                    <label name="died_at_the_hospital"/>
+                    <field name="died_at_the_hospital"/>
+                    <label name="died_being_transferred"/>
+                    <field name="died_being_transferred"/>
+                    <label name="tod"/>
+                    <field name="tod"/>
+                    <label name="cod"/>
+                    <field name="cod"/>
+                </group>
+            </group>
+        </page>
+    </notebook>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_pediatrics/view/gnuhealth_newborn_tree.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<tree string="Newborn Information">
+    <field name="name"/>
+    <field name="newborn_name"/>
+    <field name="mother"/>
+    <field name="birth_date"/>
+    <field name="sex"/>
+    <field name="length"/>
+    <field name="weight"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_pediatrics/view/gnuhealth_pediatric_symptoms_checklist.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<form string="Pediatric Symptoms Checklist - PSC">
+    <group colspan="4" id="group_psc1">
+        <group colspan="4" col="10" id="group_psc_header">
+            <label name="patient"/>
+            <field name="patient"/>
+            <label name="evaluation_start"/>
+            <field name="evaluation_start"/>
+            <!--
+            <label name="evaluation_end"/>
+            <field name="evaluation_end"/>
+            -->
+            <label name="evaluation_date"/>
+            <field name="evaluation_date"/>
+            <label name="psc_total"/>
+            <field name="psc_total"/>
+        </group>
+        <newline/>
+        <separator colspan="4" id="separator_psc1"/>
+        <newline/>
+        <label name="psc_aches_pains"/>
+        <field name="psc_aches_pains"/>
+        <label name="psc_spend_time_alone"/>
+        <field name="psc_spend_time_alone"/>
+        <label name="psc_tires_easily"/>
+        <field name="psc_tires_easily"/>
+        <label name="psc_fidgety"/>
+        <field name="psc_fidgety"/>
+        <label name="psc_trouble_with_teacher"/>
+        <field name="psc_trouble_with_teacher"/>
+        <label name="psc_less_interest_in_school"/>
+        <field name="psc_less_interest_in_school"/>
+        <label name="psc_acts_as_driven_by_motor"/>
+        <field name="psc_acts_as_driven_by_motor"/>
+        <label name="psc_daydreams_too_much"/>
+        <field name="psc_daydreams_too_much"/>
+        <label name="psc_distracted_easily"/>
+        <field name="psc_distracted_easily"/>
+        <label name="psc_afraid_of_new_situations"/>
+        <field name="psc_afraid_of_new_situations"/>
+        <label name="psc_sad_unhappy"/>
+        <field name="psc_sad_unhappy"/>
+        <label name="psc_irritable_angry"/>
+        <field name="psc_irritable_angry"/>
+        <label name="psc_feels_hopeless"/>
+        <field name="psc_feels_hopeless"/>
+        <label name="psc_trouble_concentrating"/>
+        <field name="psc_trouble_concentrating"/>
+        <label name="psc_less_interested_in_friends"/>
+        <field name="psc_less_interested_in_friends"/>
+        <label name="psc_fights_with_others"/>
+        <field name="psc_fights_with_others"/>
+        <label name="psc_absent_from_school"/>
+        <field name="psc_absent_from_school"/>
+        <label name="psc_school_grades_dropping"/>
+        <field name="psc_school_grades_dropping"/>
+        <label name="psc_down_on_self"/>
+        <field name="psc_down_on_self"/>
+        <label name="psc_visit_doctor_finds_ok"/>
+        <field name="psc_visit_doctor_finds_ok"/>
+        <label name="psc_trouble_sleeping"/>
+        <field name="psc_trouble_sleeping"/>
+        <label name="psc_worries_a_lot"/>
+        <field name="psc_worries_a_lot"/>
+        <label name="psc_wants_to_be_with_parents"/>
+        <field name="psc_wants_to_be_with_parents"/>
+        <label name="psc_feels_is_bad_child"/>
+        <field name="psc_feels_is_bad_child"/>
+        <label name="psc_takes_unnecesary_risks"/>
+        <field name="psc_takes_unnecesary_risks"/>
+        <label name="psc_gets_hurt_often"/>
+        <field name="psc_gets_hurt_often"/>
+        <label name="psc_having_less_fun"/>
+        <field name="psc_having_less_fun"/>
+        <label name="psc_act_as_younger"/>
+        <field name="psc_act_as_younger"/>
+        <label name="psc_does_not_listen_to_rules"/>
+        <field name="psc_does_not_listen_to_rules"/>
+        <label name="psc_does_not_show_feelings"/>
+        <field name="psc_does_not_show_feelings"/>
+        <label name="psc_does_not_get_people_feelings"/>
+        <field name="psc_does_not_get_people_feelings"/>
+        <label name="psc_teases_others"/>
+        <field name="psc_teases_others"/>
+        <label name="psc_takes_things_from_others"/>
+        <field name="psc_takes_things_from_others"/>
+        <label name="psc_refuses_to_share"/>
+        <field name="psc_refuses_to_share"/>
+    </group>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_pediatrics/view/gnuhealth_pediatric_symptoms_checklist_tree.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<tree string="PSC - Pediatric Symptoms Checklist History" colors="If(Greater(Eval('psc_total',0), 27),'red','blue')">
+    <field name="patient"/>
+    <field name="evaluation_start"/>
+    <field name="psc_total"/>
+</tree>
--- a/tryton/health_qrcodes/health_qrcodes_view.xml
+++ b/tryton/health_qrcodes/health_qrcodes_view.xml
@@ -7,20 +7,7 @@
             <field name="model">gnuhealth.patient</field>
             <field name="inherit" ref="health.gnuhealth_patient_view_form"/>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="//group[@id=&quot;misc_info_group&quot;]"
-                        position="before">
-                        <group id="patient_qr">
-                            <field xfill="0" xexpand="1" name="qr" widget="image"/>
-                        </group>
-                        <newline/>
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_patient_form</field>
         </record>
 
 <!-- NEWBORN -->
@@ -28,19 +15,7 @@
             <field name="model">gnuhealth.newborn</field>
             <field name="inherit" ref="health_pediatrics.gnuhealth_newborn_view"/>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="//group[@id=&quot;group_newborn_notes&quot;]"
-                        position="after">
-                        <group id="group_qr">
-                            <field name="qr" widget="image"/>
-                        </group>
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">newborn_form</field>
         </record>
 
     </data>
--- a/tryton/health_qrcodes/setup.py
+++ b/tryton/health_qrcodes/setup.py
@@ -61,7 +61,8 @@
     package_data={
         'trytond.modules.health_qrcodes': info.get('xml', []) \
             + info.get('translation', []) \
-            + ['tryton.cfg', 'doc/*.rst', 'locale/*.po', 'report/*.odt', 'icons/*.svg'],
+            + ['tryton.cfg', 'view/*.xml', 'doc/*.rst', 'locale/*.po',
+               'report/*.odt', 'icons/*.svg'],
         },
 
     classifiers=[
new file mode 100644
--- /dev/null
+++ b/tryton/health_qrcodes/view/gnuhealth_patient_form.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<data>
+    <xpath expr="//group[@id=&quot;misc_info_group&quot;]" position="before">
+        <group id="patient_qr">
+            <field xfill="0" xexpand="1" name="qr" widget="image"/>
+        </group>
+        <newline/>
+    </xpath>
+</data>
new file mode 100644
--- /dev/null
+++ b/tryton/health_qrcodes/view/newborn_form.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data>
+    <xpath expr="//group[@id=&quot;group_newborn_notes&quot;]" position="after">
+        <group id="group_qr">
+            <field name="qr" widget="image"/>
+        </group>
+    </xpath>
+</data>
--- a/tryton/health_reporting/health_reporting.xml
+++ b/tryton/health_reporting/health_reporting.xml
@@ -14,30 +14,12 @@
         <record model="ir.ui.view" id="top_diseases_view_tree">
             <field name="model">gnuhealth.top_diseases</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Top Diseases">
-                    <field name="disease" expand="1"/>
-                    <field name="cases" sum="Cases"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">top_diseases_tree</field>
         </record>
         <record model="ir.ui.view" id="top_diseases_view_graph">
             <field name="model">gnuhealth.top_diseases</field>
             <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <graph string="Top Diseases">
-                    <x>
-                        <field name="disease"/>
-                    </x>
-                    <y>
-                        <field name="cases"/>
-                    </y>
-                </graph>
-                ]]>
-            </field>
+            <field name="name">top_diseases_graph</field>
         </record>
         <record model="ir.action.act_window" id="act_top_diseases_form">
             <field name="name">Top Diseases</field>
@@ -59,20 +41,7 @@
         <record model="ir.ui.view" id="top_diseases_open_start_view_form">
             <field name="model">gnuhealth.top_diseases.open.start</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Top Diseases">
-                    <label name="start_date"/>
-                    <field name="start_date"/>
-                    <label name="end_date"/>
-                    <field name="end_date"/>
-                    <label name="group"/>
-                    <field name="group"/>
-                    <label name="number_records"/>
-                    <field name="number_records"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">top_diseases_open_start_form</field>
         </record>
         <record model="ir.action.wizard" id="act_top_diseases_open">
             <field name="name">Top Diseases</field>
@@ -85,30 +54,12 @@
         <record model="ir.ui.view" id="evaluations_doctor_view_tree">
             <field name="model">gnuhealth.evaluations_doctor</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Evaluations per Doctor">
-                    <field name="doctor" expand="1"/>
-                    <field name="evaluations" sum="Evaluations"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">evaluations_doctor_tree</field>
         </record>
         <record model="ir.ui.view" id="evaluations_doctor_view_graph">
             <field name="model">gnuhealth.evaluations_doctor</field>
             <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <graph string="Evaluations per Doctor">
-                    <x>
-                        <field name="doctor"/>
-                    </x>
-                    <y>
-                        <field name="evaluations"/>
-                    </y>
-                </graph>
-                ]]>
-            </field>
+            <field name="name">evaluations_doctor_graph</field>
         </record>
         <record model="ir.action.act_window" id="act_evaluations_doctor_form">
             <field name="name">Evaluations per Doctor</field>
@@ -130,16 +81,7 @@
         <record model="ir.ui.view" id="evaluations_doctor_open_start_view_form">
             <field name="model">gnuhealth.evaluations_doctor.open.start</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Evaluations per Doctor">
-                    <label name="start_date"/>
-                    <field name="start_date"/>
-                    <label name="end_date"/>
-                    <field name="end_date"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">evaluations_doctor_open_start_form</field>
         </record>
         <record model="ir.action.wizard" id="act_evaluations_doctor_open">
             <field name="name">Evaluations per Doctor</field>
@@ -152,16 +94,7 @@
         <record model="ir.ui.view" id="evaluations_doctor_weekly_view_tree">
             <field name="model">gnuhealth.evaluations_doctor_weekly</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Evaluations per Doctor per Week">
-                    <field name="year"/>
-                    <field name="week"/>
-                    <field name="doctor" expand="1"/>
-                    <field name="evaluations"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">evaluations_doctor_weekly_tree</field>
         </record>
         <record model="ir.action.act_window"
             id="act_evaluations_doctor_weekly_form">
@@ -182,16 +115,7 @@
         <record model="ir.ui.view" id="evaluations_doctor_monthly_view_tree">
             <field name="model">gnuhealth.evaluations_doctor_monthly</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Evaluations per Doctor per Month">
-                    <field name="year"/>
-                    <field name="month"/>
-                    <field name="doctor" expand="1"/>
-                    <field name="evaluations"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">evaluations_doctor_monthly_tree</field>
         </record>
         <record model="ir.action.act_window"
             id="act_evaluations_doctor_monthly_form">
@@ -212,30 +136,12 @@
         <record model="ir.ui.view" id="evaluations_specialty_view_tree">
             <field name="model">gnuhealth.evaluations_specialty</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Evaluations per Specialty">
-                    <field name="specialty" expand="1"/>
-                    <field name="evaluations" sum="Evaluations"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">evaluations_specialty_tree</field>
         </record>
         <record model="ir.ui.view" id="evaluations_specialty_view_graph">
             <field name="model">gnuhealth.evaluations_specialty</field>
             <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <graph string="Evaluations per Specialty">
-                    <x>
-                        <field name="specialty"/>
-                    </x>
-                    <y>
-                        <field name="evaluations"/>
-                    </y>
-                </graph>
-                ]]>
-            </field>
+            <field name="name">evaluations_specialty_graph</field>
         </record>
         <record model="ir.action.act_window" id="act_evaluations_specialty_form">
             <field name="name">Evaluations per Specialty</field>
@@ -257,16 +163,7 @@
         <record model="ir.ui.view" id="evaluations_specialty_open_start_view_form">
             <field name="model">gnuhealth.evaluations_specialty.open.start</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Evaluations per Specialty">
-                    <label name="start_date"/>
-                    <field name="start_date"/>
-                    <label name="end_date"/>
-                    <field name="end_date"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">evaluations_specialty_open_start_form</field>
         </record>
         <record model="ir.action.wizard" id="act_evaluations_specialty_open">
             <field name="name">Evaluations per Specialty</field>
@@ -279,16 +176,7 @@
         <record model="ir.ui.view" id="evaluations_specialty_weekly_view_tree">
             <field name="model">gnuhealth.evaluations_specialty_weekly</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Evaluations per Specialty per Week">
-                    <field name="year"/>
-                    <field name="week"/>
-                    <field name="specialty" expand="1"/>
-                    <field name="evaluations"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">evaluations_specialty_weekly_tree</field>
         </record>
         <record model="ir.action.act_window"
             id="act_evaluations_specialty_weekly_form">
@@ -309,16 +197,7 @@
         <record model="ir.ui.view" id="evaluations_specialty_monthly_view_tree">
             <field name="model">gnuhealth.evaluations_specialty_monthly</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Evaluations per Specialty per Month">
-                    <field name="year"/>
-                    <field name="month"/>
-                    <field name="specialty" expand="1"/>
-                    <field name="evaluations"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">evaluations_specialty_monthly_tree</field>
         </record>
         <record model="ir.action.act_window"
             id="act_evaluations_specialty_monthly_form">
@@ -339,30 +218,12 @@
         <record model="ir.ui.view" id="evaluations_sector_view_tree">
             <field name="model">gnuhealth.evaluations_sector</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Evaluations per Operational Sector">
-                    <field name="sector" expand="1"/>
-                    <field name="evaluations" sum="Evaluations"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">evaluations_sector_tree</field>
         </record>
         <record model="ir.ui.view" id="evaluations_sector_view_graph">
             <field name="model">gnuhealth.evaluations_sector</field>
             <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <graph string="Evaluations per Operational Sector">
-                    <x>
-                        <field name="sector"/>
-                    </x>
-                    <y>
-                        <field name="evaluations"/>
-                    </y>
-                </graph>
-                ]]>
-            </field>
+            <field name="name">evaluations_sector_graph</field>
         </record>
         <record model="ir.action.act_window" id="act_evaluations_sector_form">
             <field name="name">Evaluations per Sector</field>
@@ -384,16 +245,7 @@
         <record model="ir.ui.view" id="evaluations_sector_open_start_view_form">
             <field name="model">gnuhealth.evaluations_sector.open.start</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Evaluations per Sector">
-                    <label name="start_date"/>
-                    <field name="start_date"/>
-                    <label name="end_date"/>
-                    <field name="end_date"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">evaluations_sector_open_start_form</field>
         </record>
         <record model="ir.action.wizard" id="act_evaluations_sector_open">
             <field name="name">Evaluations per Sector</field>
@@ -406,16 +258,7 @@
         <record model="ir.ui.view" id="evaluations_sector_weekly_view_tree">
             <field name="model">gnuhealth.evaluations_sector_weekly</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Evaluations per Sector per Week">
-                    <field name="year"/>
-                    <field name="week"/>
-                    <field name="sector" expand="1"/>
-                    <field name="evaluations"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">evaluations_sector_weekly_tree</field>
         </record>
         <record model="ir.action.act_window"
             id="act_evaluations_sector_weekly_form">
@@ -436,16 +279,7 @@
         <record model="ir.ui.view" id="evaluations_sector_monthly_view_tree">
             <field name="model">gnuhealth.evaluations_sector_monthly</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Evaluations per Sector per Month">
-                    <field name="year"/>
-                    <field name="month"/>
-                    <field name="sector" expand="1"/>
-                    <field name="evaluations"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">evaluations_sector_monthly_tree</field>
         </record>
         <record model="ir.action.act_window"
             id="act_evaluations_sector_monthly_form">
--- a/tryton/health_reporting/setup.py
+++ b/tryton/health_reporting/setup.py
@@ -60,7 +60,8 @@
     package_data={
         'trytond.modules.health_reporting': info.get('xml', []) \
             + info.get('translation', []) \
-            + ['tryton.cfg', 'doc/*.rst', 'locale/*.po', 'report/*.odt', 'icons/*.svg'],
+            + ['tryton.cfg', 'view/*.xml', 'doc/*.rst', 'locale/*.po',
+               'report/*.odt', 'icons/*.svg'],
         },
 
     classifiers=[
new file mode 100644
--- /dev/null
+++ b/tryton/health_reporting/view/evaluations_doctor_graph.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<graph string="Evaluations per Doctor">
+    <x>
+        <field name="doctor"/>
+    </x>
+    <y>
+        <field name="evaluations"/>
+    </y>
+</graph>
new file mode 100644
--- /dev/null
+++ b/tryton/health_reporting/view/evaluations_doctor_monthly_tree.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<tree string="Evaluations per Doctor per Month">
+    <field name="year"/>
+    <field name="month"/>
+    <field name="doctor" expand="1"/>
+    <field name="evaluations"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_reporting/view/evaluations_doctor_open_start_form.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<form string="Evaluations per Doctor">
+    <label name="start_date"/>
+    <field name="start_date"/>
+    <label name="end_date"/>
+    <field name="end_date"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_reporting/view/evaluations_doctor_tree.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<tree string="Evaluations per Doctor">
+    <field name="doctor" expand="1"/>
+    <field name="evaluations" sum="Evaluations"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_reporting/view/evaluations_doctor_weekly_tree.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<tree string="Evaluations per Doctor per Week">
+    <field name="year"/>
+    <field name="week"/>
+    <field name="doctor" expand="1"/>
+    <field name="evaluations"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_reporting/view/evaluations_sector_graph.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<graph string="Evaluations per Operational Sector">
+    <x>
+        <field name="sector"/>
+    </x>
+    <y>
+        <field name="evaluations"/>
+    </y>
+</graph>
new file mode 100644
--- /dev/null
+++ b/tryton/health_reporting/view/evaluations_sector_monthly_tree.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<tree string="Evaluations per Sector per Month">
+    <field name="year"/>
+    <field name="month"/>
+    <field name="sector" expand="1"/>
+    <field name="evaluations"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_reporting/view/evaluations_sector_open_start_form.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<form string="Evaluations per Sector">
+    <label name="start_date"/>
+    <field name="start_date"/>
+    <label name="end_date"/>
+    <field name="end_date"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_reporting/view/evaluations_sector_tree.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<tree string="Evaluations per Operational Sector">
+    <field name="sector" expand="1"/>
+    <field name="evaluations" sum="Evaluations"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_reporting/view/evaluations_sector_weekly_tree.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<tree string="Evaluations per Sector per Week">
+    <field name="year"/>
+    <field name="week"/>
+    <field name="sector" expand="1"/>
+    <field name="evaluations"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_reporting/view/evaluations_specialty_graph.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<graph string="Evaluations per Specialty">
+    <x>
+        <field name="specialty"/>
+    </x>
+    <y>
+        <field name="evaluations"/>
+    </y>
+</graph>
new file mode 100644
--- /dev/null
+++ b/tryton/health_reporting/view/evaluations_specialty_monthly_tree.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<tree string="Evaluations per Specialty per Month">
+    <field name="year"/>
+    <field name="month"/>
+    <field name="specialty" expand="1"/>
+    <field name="evaluations"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_reporting/view/evaluations_specialty_open_start_form.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<form string="Evaluations per Specialty">
+    <label name="start_date"/>
+    <field name="start_date"/>
+    <label name="end_date"/>
+    <field name="end_date"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_reporting/view/evaluations_specialty_tree.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<tree string="Evaluations per Specialty">
+    <field name="specialty" expand="1"/>
+    <field name="evaluations" sum="Evaluations"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_reporting/view/evaluations_specialty_weekly_tree.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<tree string="Evaluations per Specialty per Week">
+    <field name="year"/>
+    <field name="week"/>
+    <field name="specialty" expand="1"/>
+    <field name="evaluations"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_reporting/view/top_diseases_graph.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<graph string="Top Diseases">
+    <x>
+        <field name="disease"/>
+    </x>
+    <y>
+        <field name="cases"/>
+    </y>
+</graph>
new file mode 100644
--- /dev/null
+++ b/tryton/health_reporting/view/top_diseases_open_start_form.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<form string="Top Diseases">
+    <label name="start_date"/>
+    <field name="start_date"/>
+    <label name="end_date"/>
+    <field name="end_date"/>
+    <label name="group"/>
+    <field name="group"/>
+    <label name="number_records"/>
+    <field name="number_records"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_reporting/view/top_diseases_tree.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<tree string="Top Diseases">
+    <field name="disease" expand="1"/>
+    <field name="cases" sum="Cases"/>
+</tree>
--- a/tryton/health_services/health_services_view.xml
+++ b/tryton/health_services/health_services_view.xml
@@ -25,92 +25,27 @@
         <record model="ir.ui.view" id="gnuhealth_health_service_view">
             <field name="model">gnuhealth.health_service</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="service ">
-                    <group colspan="4" col="8" id="group_service_header">
-                        <label name="name"/>
-                        <field name="name"/>
-                        <label name="service_date"/>
-                        <field name="service_date"/>
-                        <label name="desc"/>
-                        <field name="desc"/>
-                        <label name="patient"/>
-                        <field name="patient"/>
-                    </group>
-
-                    <newline/>
-                    <field colspan="4" name="service_line"/>
-                    <newline/>
-                    <label name="state"/>
-                    <field name="state"/>
-                    <button name="button_set_to_draft" string="Set to Draft"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_health_service</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_health_service_tree">
             <field name="model">gnuhealth.health_service</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Health service ">
-                    <field name="name" expand="1"/>
-                    <field name="service_date" expand="1"/>
-                    <field name="patient" expand="1"/>
-                    <field name="desc" expand="1"/>
-                    <field name="state" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_health_service_tree</field>
         </record>
 
 
         <record model="ir.ui.view" id="gnuhealth_health_service_line_view">
             <field name="model">gnuhealth.health_service.line</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Service Line">
-                    <label name="name"/>
-                    <field name="name"/>
-                    <label name="desc"/>
-                    <field name="desc"/>
-                    <label name="to_invoice"/>
-                    <field name="to_invoice"/>
-                    <label name="product"/>
-                    <field name="product"/>
-                    <label name="qty"/>
-                    <field name="qty"/>
-                    <label name="from_date"/>
-                    <field name="from_date"/>
-                    <label name="to_date"/>
-                    <field name="to_date"/>
-                    <label name="appointment"/>
-                    <field name="appointment"/>
-
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_health_service_line</field>
         </record>
 
 
         <record model="ir.ui.view" id="gnuhealth_health_service_line_tree">
             <field name="model">gnuhealth.health_service.line</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree editable="top" string="Health Service Line">
-                    <field name="to_invoice" expand="1"/>
-                    <field name="desc" expand="1"/>
-                    <field name="product" expand="1"/>
-                    <field name="qty" expand="1"/>
-                    <field name="from_date" expand="1"/>
-                    <field name="to_date" expand="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_health_service_line_tree</field>
         </record>
 
 
--- a/tryton/health_services/setup.py
+++ b/tryton/health_services/setup.py
@@ -62,7 +62,8 @@
     package_data={
         'trytond.modules.health_services': info.get('xml', []) \
             + info.get('translation', []) \
-            + ['tryton.cfg', 'doc/*.rst', 'locale/*.po', 'report/*.odt', 'icons/*.svg'],
+            + ['tryton.cfg', 'view/*.xml', 'doc/*.rst', 'locale/*.po',
+               'report/*.odt', 'icons/*.svg'],
         },
 
     classifiers=[
new file mode 100644
--- /dev/null
+++ b/tryton/health_services/view/gnuhealth_health_service.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<form string="service ">
+    <group colspan="4" col="8" id="group_service_header">
+        <label name="name"/>
+        <field name="name"/>
+        <label name="service_date"/>
+        <field name="service_date"/>
+        <label name="desc"/>
+        <field name="desc"/>
+        <label name="patient"/>
+        <field name="patient"/>
+    </group>
+    <newline/>
+    <field colspan="4" name="service_line"/>
+    <newline/>
+    <label name="state"/>
+    <field name="state"/>
+    <button name="button_set_to_draft" string="Set to Draft"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_services/view/gnuhealth_health_service_line.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<form string="Service Line">
+    <label name="name"/>
+    <field name="name"/>
+    <label name="desc"/>
+    <field name="desc"/>
+    <label name="to_invoice"/>
+    <field name="to_invoice"/>
+    <label name="product"/>
+    <field name="product"/>
+    <label name="qty"/>
+    <field name="qty"/>
+    <label name="from_date"/>
+    <field name="from_date"/>
+    <label name="to_date"/>
+    <field name="to_date"/>
+    <label name="appointment"/>
+    <field name="appointment"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_services/view/gnuhealth_health_service_line_tree.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<tree editable="top" string="Health Service Line">
+    <field name="to_invoice" expand="1"/>
+    <field name="desc" expand="1"/>
+    <field name="product" expand="1"/>
+    <field name="qty" expand="1"/>
+    <field name="from_date" expand="1"/>
+    <field name="to_date" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_services/view/gnuhealth_health_service_tree.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<tree string="Health service ">
+    <field name="name" expand="1"/>
+    <field name="service_date" expand="1"/>
+    <field name="patient" expand="1"/>
+    <field name="desc" expand="1"/>
+    <field name="state" expand="1"/>
+</tree>
--- a/tryton/health_socioeconomics/health_socioeconomics_view.xml
+++ b/tryton/health_socioeconomics/health_socioeconomics_view.xml
@@ -9,21 +9,7 @@
             <field name="model">party.party</field>
             <field name="inherit" ref="party.party_view_form"/>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="//field[@name=&quot;sex&quot;]"
-                        position="after">
-                        <label name="occupation"/>
-                        <field name="occupation"/>
-                        <label name="education"/>
-                        <field name="education"/>
-                    </xpath>
-
-                </data>
-                ]]>
-            </field>
+            <field name="name">party_form</field>
         </record>
         
 <!-- Include the Socioeconomics page into the Patient History -->
@@ -32,97 +18,7 @@
             <field name="model">gnuhealth.patient</field>
             <field name="inherit" ref="health.gnuhealth_patient_view_form" />
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/form/notebook/page[@id=&quot;general_info&quot;]"
-                        position="after">
-
-                        <page string="Socioeconomics" id="page_socioeconomics">
-                            <notebook>
-
-                                <page string="Main" id="page_ses_main">
-                                    <group colspan="4" col="4" id="group_ses_holder2">
-                                        <label name="ses"/>
-                                        <field name="ses"/>
-                                        <label name="housing"/>
-                                        <field name="housing"/>
-                                        <label name="education"/>
-                                        <field name="education"/>
-                                        <label name="occupation"/>
-                                        <field name="occupation"/>
-                                    </group>
-                                    <newline/>
-                                    <group col="6" id="group_socioecomics_work">
-                                        <newline/>
-                                        <label name="works_at_home"/>
-                                        <field name="works_at_home"/>
-                                        <label name="hours_outside"/>
-                                        <field name="hours_outside"/>
-                                        <label name="hostile_area"/>
-                                        <field name="hostile_area"/>
-                                    </group>
-
-                                    <newline/>
-
-
-                                    <newline/>
-                                    <group string="Notes" id="group_ses_notes">
-                                        <field colspan="4" name="ses_notes"/>
-                                    </group>
-                                </page>
-
-                               
-                                <page string="Family" id="page_family">
-                                    <group colspan="4" col="6" string="Family APGAR" id="group_ses_family_apgar">
-                                        <label name="fam_apgar_help" />
-                                        <field name="fam_apgar_help" />
-                                        <label name="fam_apgar_discussion"/>
-                                        <field name="fam_apgar_discussion"/>
-                                        <label name="fam_apgar_decisions"/>
-                                        <field name="fam_apgar_decisions"/>
-                                        <label name="fam_apgar_timesharing"/>
-                                        <field name="fam_apgar_timesharing"/>
-                                        <label name="fam_apgar_affection"/>
-                                        <field name="fam_apgar_affection"/>
-                                        <label name="fam_apgar_score"/>
-                                        <field name="fam_apgar_score"/>
-                                    </group>
-                                    <newline/>
-                                    <group colspan="4" col="8" string="Other Family Issues" id="group_ses_other_family_issues">
-                                        <label name="single_parent"/>
-                                        <field name="single_parent"/>
-                                        <label name="domestic_violence"/>
-                                        <field name="domestic_violence"/>
-                                        <label name="working_children"/>
-                                        <field name="working_children"/>
-                                        <label name="teenage_pregnancy"/>
-                                        <field name="teenage_pregnancy"/>
-                                        <label name="sexual_abuse"/>
-                                        <field name="sexual_abuse"/>
-                                        <label name="drug_addiction"/>
-                                        <field name="drug_addiction"/>
-                                        <label name="school_withdrawal"/>
-                                        <field name="school_withdrawal"/>
-                                        <label name="prison_past"/>
-                                        <field name="prison_past"/>
-                                        <label name="prison_current"/>
-                                        <field name="prison_current"/>
-
-                                        <label name="relative_in_prison"/>
-                                        <field name="relative_in_prison"/>
-                                    </group>
-
-                                </page>
-
-                            </notebook>
-                        </page>
-
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_patient</field>
         </record>
 
     </data>
--- a/tryton/health_socioeconomics/setup.py
+++ b/tryton/health_socioeconomics/setup.py
@@ -60,7 +60,8 @@
     package_data={
         'trytond.modules.health_socioeconomics': info.get('xml', []) \
             + info.get('translation', []) \
-            + ['tryton.cfg', 'doc/*.rst', 'locale/*.po', 'report/*.odt', 'icons/*.svg'],
+            + ['tryton.cfg', 'view/*.xml', 'doc/*.rst', 'locale/*.po',
+               'report/*.odt', 'icons/*.svg'],
         },
 
     classifiers=[
new file mode 100644
--- /dev/null
+++ b/tryton/health_socioeconomics/view/gnuhealth_patient.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<data>
+    <xpath expr="/form/notebook/page[@id=&quot;general_info&quot;]" position="after">
+        <page string="Socioeconomics" id="page_socioeconomics">
+            <notebook>
+                <page string="Main" id="page_ses_main">
+                    <group colspan="4" col="4" id="group_ses_holder2">
+                        <label name="ses"/>
+                        <field name="ses"/>
+                        <label name="housing"/>
+                        <field name="housing"/>
+                        <label name="education"/>
+                        <field name="education"/>
+                        <label name="occupation"/>
+                        <field name="occupation"/>
+                    </group>
+                    <newline/>
+                    <group col="6" id="group_socioecomics_work">
+                        <newline/>
+                        <label name="works_at_home"/>
+                        <field name="works_at_home"/>
+                        <label name="hours_outside"/>
+                        <field name="hours_outside"/>
+                        <label name="hostile_area"/>
+                        <field name="hostile_area"/>
+                    </group>
+                    <newline/>
+                    <newline/>
+                    <group string="Notes" id="group_ses_notes">
+                        <field colspan="4" name="ses_notes"/>
+                    </group>
+                </page>
+                <page string="Family" id="page_family">
+                    <group colspan="4" col="6" string="Family APGAR" id="group_ses_family_apgar">
+                        <label name="fam_apgar_help"/>
+                        <field name="fam_apgar_help"/>
+                        <label name="fam_apgar_discussion"/>
+                        <field name="fam_apgar_discussion"/>
+                        <label name="fam_apgar_decisions"/>
+                        <field name="fam_apgar_decisions"/>
+                        <label name="fam_apgar_timesharing"/>
+                        <field name="fam_apgar_timesharing"/>
+                        <label name="fam_apgar_affection"/>
+                        <field name="fam_apgar_affection"/>
+                        <label name="fam_apgar_score"/>
+                        <field name="fam_apgar_score"/>
+                    </group>
+                    <newline/>
+                    <group colspan="4" col="8" string="Other Family Issues" id="group_ses_other_family_issues">
+                        <label name="single_parent"/>
+                        <field name="single_parent"/>
+                        <label name="domestic_violence"/>
+                        <field name="domestic_violence"/>
+                        <label name="working_children"/>
+                        <field name="working_children"/>
+                        <label name="teenage_pregnancy"/>
+                        <field name="teenage_pregnancy"/>
+                        <label name="sexual_abuse"/>
+                        <field name="sexual_abuse"/>
+                        <label name="drug_addiction"/>
+                        <field name="drug_addiction"/>
+                        <label name="school_withdrawal"/>
+                        <field name="school_withdrawal"/>
+                        <label name="prison_past"/>
+                        <field name="prison_past"/>
+                        <label name="prison_current"/>
+                        <field name="prison_current"/>
+                        <label name="relative_in_prison"/>
+                        <field name="relative_in_prison"/>
+                    </group>
+                </page>
+            </notebook>
+        </page>
+    </xpath>
+</data>
new file mode 100644
--- /dev/null
+++ b/tryton/health_socioeconomics/view/party_form.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<data>
+    <xpath expr="//field[@name=&quot;sex&quot;]" position="after">
+        <label name="occupation"/>
+        <field name="occupation"/>
+        <label name="education"/>
+        <field name="education"/>
+    </xpath>
+</data>
--- a/tryton/health_stock/health_stock.xml
+++ b/tryton/health_stock/health_stock.xml
@@ -5,361 +5,107 @@
         <record model="ir.ui.view" id="gnuhealth_medicament_tree_stock">
             <field name="model">gnuhealth.medicament</field>
             <field name="inherit" ref="health.gnuhealth_medicament_tree"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <data>
-                        <xpath
-                            expr="/tree/field[@name=&quot;category&quot;]"
-                            position="after">
-                            <field name="quantity"/>
-                        </xpath>
-                    </data>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_medicament_tree_stock</field>
         </record>
 
         <record model="ir.ui.view" id="view_party_form">
             <field name="model">party.party</field>
             <field name="inherit" ref="party.party_view_form"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <data>
-                        <xpath
-                            expr="/form/notebook/page[@id=&quot;stock&quot;]/field[@name=&quot;supplier_location&quot;]"
-                            position="after">
-                            <label name="warehouse"/>
-                            <field name="warehouse"/>
-                        </xpath>
-                    </data>
-                ]]>
-            </field>
+            <field name="name">party_form</field>
         </record>
 
         <record model="ir.ui.view" id="lot_view_form">
             <field name="model">stock.lot</field>
             <field name="inherit" ref="stock_lot.lot_view_form"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <data>
-                        <xpath expr="/form/field[@name=&quot;product&quot;]" position="after">
-                                <label name="expiration_date"/>
-                                <field name="expiration_date"/>
-                                <label name="quantity"/>
-                                <field name="quantity"/>
-                        </xpath>
-                    </data>
-                ]]>
-            </field>
+            <field name="name">lot_form</field>
         </record>
         <record model="ir.ui.view" id="lot_view_tree">
            <field name="model">stock.lot</field>
            <field name="inherit" ref="stock_lot.lot_view_tree"/>
-           <field name="arch" type="xml">
-               <![CDATA[
-                   <data>
-                       <xpath expr="/tree/field[@name=&quot;product&quot;]" position="after">
-                           <field name="expiration_date"/>
-                           <field name="quantity"/>
-                       </xpath>
-                   </data>
-                ]]>
-            </field>
+           <field name="name">lot_tree</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_ambulatory_care_medicament_tree">
            <field name="model">gnuhealth.patient.ambulatory_care.medicament</field>
            <field name="type">tree</field>
-           <field name="arch" type="xml">
-               <![CDATA[
-                   <tree string="Medicament">
-                       <field name="medicament"/>
-                       <field name="quantity"/>
-                       <field name="lot"/>
-                       <field name="short_comment" expand="1"/>
-                   </tree>
-                ]]>
-            </field>
+           <field name="name">gnuhealth_ambulatory_care_medicament_tree</field>
         </record>
         <record model="ir.ui.view" id="gnuhealth_ambulatory_care_medicament_form">
            <field name="model">gnuhealth.patient.ambulatory_care.medicament</field>
            <field name="type">form</field>
-           <field name="arch" type="xml">
-               <![CDATA[
-                   <form string="Medicament">
-                       <label name="medicament"/>
-                       <field name="medicament"/>
-                       <label name="quantity"/>
-                       <field name="quantity"/>
-                       <label name="lot"/>
-                       <field name="lot"/>
-                       <label name="short_comment"/>
-                       <field name="short_comment"/>
-                       <label name="product"/>
-                       <field name="product"/>
-                   </form>
-               ]]>
-           </field>
+           <field name="name">gnuhealth_ambulatory_care_medicament_form</field>
         </record>
         <record model="ir.ui.view" id="gnuhealth_ambulatory_care_medical_supplies_tree">
             <field name="model">gnuhealth.patient.ambulatory_care.medical_supply</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <tree string="Medical Supplies">
-                        <field name="product"/>
-                        <field name="quantity"/>
-                        <field name="lot"/>
-                    </tree>
-                    ]]>
-            </field>
+            <field name="name">gnuhealth_ambulatory_care_medical_supplies_tree</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_ambulatory_care_vaccine_tree">
             <field name="model">gnuhealth.patient.ambulatory_care.vaccine</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <tree string="Vaccines">
-                        <field name="vaccine"/>
-                        <field name="quantity"/>
-                        <field name="lot"/>
-                        <field name="dose"/>
-                        <field name="next_dose_date"/>
-                    </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_ambulatory_care_vaccine_tree</field>
         </record>
         <record model="ir.ui.view" id="gnuhealth_ambulatory_care_vaccine_form">
             <field name="model">gnuhealth.patient.ambulatory_care.vaccine</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <form string="Vaccines">
-                        <label name="vaccine"/>
-                        <field name="vaccine"/>
-                        <label name="quantity"/>
-                        <field name="quantity"/>
-                        <label name="lot"/>
-                        <field name="lot"/>
-                        <label name="dose"/>
-                        <field name="dose"/>
-                        <label name="next_dose_date"/>
-                        <field name="next_dose_date"/>
-                        <label name="admin_route"/>
-                        <field name="admin_route"/>
-                    </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_ambulatory_care_vaccine_form</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_patient_ambulatory_care_tree">
             <field name="model">gnuhealth.patient.ambulatory_care</field>
             <field name="inherit" ref="health_nursing.gnuhealth_patient_ambulatory_care_tree"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <data>
-                        <xpath expr="/tree/field[@name=&quot;evolution&quot;]"
-                            position="after">
-                            <field name="state"/>
-                        </xpath>
-                    </data>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_patient_ambulatory_care_tree</field>
         </record>
         <record model="ir.ui.view" id="ambulatory_care_view_form">
             <field name="model">gnuhealth.patient.ambulatory_care</field>
             <field name="inherit" ref="health_nursing.gnuhealth_patient_ambulatory_care_view"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <data>
-                        <xpath expr="/form/notebook/page[@id=&quot;ambulatory_care_other_information&quot;]" position="after">
-                            <page string="Medication" id="medication">
-                                <label name="care_location"/>
-                                <field name="care_location"/>
-                                <field name="medicaments" colspan="4"
-                                    view_ids="health_stock.gnuhealth_ambulatory_care_medicament_tree"/>
-                                <field name="medical_supplies" colspan="4"
-                                    view_ids="health_stock.gnuhealth_ambulatory_care_medical_supplies_tree"/>
-                                <field name="vaccines" colspan="4"
-                                    view_ids="health_stock.gnuhealth_ambulatory_care_vaccine_tree"/>
-                            </page>
-                            <page string="Stock Moves" id="Stock Moves">
-                                <field name="moves" colspan="4" />
-                            </page>
-                        </xpath>
-                         <xpath expr="/form/notebook"
-                             position="after">
-                             <group col="5" colspan="4" id="buttons">
-                                <label name="state"/>
-                                <field name="state"/>
-                                <button name="done" string="Done" icon="tryton-go-next"/>
-                             </group>
-                         </xpath>
-                         <xpath expr="/form/notebook/page[@id=&quot;ambulatory_care_main&quot;]/field[@name=&quot;session_notes&quot;]"
-                             position="replace_attributes">
-                             <field name="session_notes" height="50"/>
-                         </xpath>
-                    </data>
-                 ]]>
-            </field>
+            <field name="name">ambulatory_care_form</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_rounding_medicament_tree">
             <field name="model">gnuhealth.patient.rounding.medicament</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <tree string="Medicament">
-                        <field name="medicament"/>
-                        <field name="quantity"/>
-                        <field name="lot"/>
-                        <field name="short_comment" expand="1"/>
-                    </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_rounding_medicament_tree</field>
         </record>
         <record model="ir.ui.view" id="gnuhealth_rounding_medicament_form">
             <field name="model">gnuhealth.patient.rounding.medicament</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <form string="Medicament">
-                        <label name="medicament"/>
-                        <field name="medicament"/>
-                        <label name="quantity"/>
-                        <field name="quantity"/>
-                        <label name="lot"/>
-                        <field name="lot"/>
-                        <label name="short_comment"/>
-                        <field name="short_comment"/>
-                        <label name="product"/>
-                        <field name="product"/>
-                    </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_rounding_medicament_form</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_rounding_medical_supply_tree">
             <field name="model">gnuhealth.patient.rounding.medical_supply</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <tree string="Medical Supplies">
-                        <field name="product"/>
-                        <field name="quantity"/>
-                        <field name="lot"/>
-                    </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_rounding_medical_supply_tree</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_rounding_vaccine_tree">
             <field name="model">gnuhealth.patient.rounding.vaccine</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <tree string="Vaccines">
-                        <field name="vaccine"/>
-                        <field name="quantity"/>
-                        <field name="lot"/>
-                        <field name="dose"/>
-                        <field name="next_dose_date"/>
-                    </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_ambulatory_care_vaccine_tree</field>
         </record>
         <record model="ir.ui.view" id="gnuhealth_rounding_vaccine_form">
             <field name="model">gnuhealth.patient.rounding.vaccine</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <form string="Vaccines">
-                        <label name="vaccine"/>
-                        <field name="vaccine"/>
-                        <label name="quantity"/>
-                        <field name="quantity"/>
-                        <label name="lot"/>
-                        <field name="lot"/>
-                        <label name="dose"/>
-                        <field name="dose"/>
-                        <label name="next_dose_date"/>
-                        <field name="next_dose_date"/>
-                        <label name="admin_route"/>
-                        <field name="admin_route"/>
-                    </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_ambulatory_care_vaccine_form</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_patient_rounding_tree">
             <field name="model">gnuhealth.patient.rounding</field>
             <field name="inherit" ref="health_nursing.gnuhealth_patient_rounding_tree"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <data>
-                        <xpath expr="/tree/field[@name=&quot;evolution&quot;]"
-                            position="after">
-                            <field name="state"/>
-                        </xpath>
-                    </data>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_patient_ambulatory_care_tree</field>
         </record>
         <record model="ir.ui.view" id="gnuhealth_patient_rounding_view">
             <field name="model">gnuhealth.patient.rounding</field>
             <field name="inherit" ref="health_nursing.gnuhealth_patient_rounding_view"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <data>
-                        <xpath expr="/form/notebook/page[@id=&quot;rounding_procedures&quot;]"
-                            position="after">
-                            <page string="Medication" id="medication">
-                                <label name="hospitalization_location"/>
-                                <field name="hospitalization_location"/>
-                                <field name="medicaments" colspan="4"
-                                    view_ids="health_stock.gnuhealth_rounding_medicament_tree" />
-                                <field name="medical_supplies" colspan="4"
-                                    view_ids="health_stock.gnuhealth_rounding_medical_supply_tree" />
-                                <field name="vaccines" colspan="4"
-                                    view_ids="health_stock.gnuhealth_rounding_vaccine_tree" />
-                            </page>
-                            <page string="Stock Moves" id="Stock Moves">
-                                <field name="moves" colspan="4" />
-                            </page>
-                        </xpath>
-                        <xpath expr="/form/notebook"
-                            position="after">
-                            <group col="5" colspan="4" id="buttons">
-                                <label name="state"/>
-                                <field name="state"/>
-                                <button name="done" string="Done"
-                                    icon="tryton-go-next"/>
-                            </group>
-                        </xpath>
-                        <xpath expr="/form/notebook/page[@id=&quot;rounding_main&quot;]/field[@name=&quot;round_summary&quot;]"
-                            position="replace_attributes">
-                            <field name="round_summary" height="50"/>
-                        </xpath>
-                        <xpath expr="/form/notebook/page[@id=&quot;rounding_main&quot;]/group[@id=&quot;the_six_p_wiew&quot;]"
-                            position="replace_attributes">
-                            <group colspan="4" col="12" id="the_six_p_wiew" string="Six P's"/>
-                        </xpath>
-                    </data>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_patient_rounding</field>
         </record>
 
         <record model="ir.ui.view" id="view_create_prescription_stock_move">
             <field name="model">gnuhealth.prescription.stock.move.init</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <form string="Create Prescription Stock Move">
-                        <separator string="Create Stock Move?" colspan="4"
-                            id="stock_move_ask"/>
-                    </form>
-                ]]>
-            </field>
+            <field name="name">create_prescription_stock_move</field>
         </record>
 
         <record model="ir.action.wizard" id="act_create_prescription_stock_move">
@@ -376,34 +122,12 @@
         <record model="ir.ui.view" id="move_view_tree">
             <field name="model">stock.move</field>
             <field name="inherit" ref="stock.move_view_tree"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <data>
-                        <xpath
-                            expr="/tree/field[@name='from_location']"
-                            position="before">
-                            <field name="origin"/>
-                        </xpath>
-                    </data>
-                ]]>
-            </field>
+            <field name="name">move_tree</field>
         </record>
         <record model="ir.ui.view" id="move_view_form">
             <field name="model">stock.move</field>
             <field name="inherit" ref="stock.move_view_form"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <data>
-                        <xpath
-                            expr="/form/label[@name='from_location']"
-                            position="before">
-                            <label name="origin"/>
-                            <field name="origin"/>
-                            <newline/>
-                        </xpath>
-                    </data>
-                ]]>
-            </field>
+            <field name="name">move_form</field>
         </record>
 
         <record model="ir.action.act_window" id="act_prescription_move_form1">
--- a/tryton/health_stock/setup.py
+++ b/tryton/health_stock/setup.py
@@ -60,8 +60,8 @@
     package_data={
         'trytond.modules.health_stock': info.get('xml', [])
             + info.get('translation', [])
-            + ['tryton.cfg', 'doc/*.rst', 'locale/*.po', 'report/*.odt',
-                'icons/*.svg'],
+            + ['tryton.cfg', 'view/*.xml', 'doc/*.rst', 'locale/*.po',
+               'report/*.odt', 'icons/*.svg'],
         },
 
     classifiers=[
new file mode 100644
--- /dev/null
+++ b/tryton/health_stock/view/ambulatory_care_form.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<data>
+    <xpath expr="/form/notebook/page[@id=&quot;ambulatory_care_other_information&quot;]" position="after">
+        <page string="Medication" id="medication">
+            <label name="care_location"/>
+            <field name="care_location"/>
+            <field name="medicaments" colspan="4" view_ids="health_stock.gnuhealth_ambulatory_care_medicament_tree"/>
+            <field name="medical_supplies" colspan="4" view_ids="health_stock.gnuhealth_ambulatory_care_medical_supplies_tree"/>
+            <field name="vaccines" colspan="4" view_ids="health_stock.gnuhealth_ambulatory_care_vaccine_tree"/>
+        </page>
+        <page string="Stock Moves" id="Stock Moves">
+            <field name="moves" colspan="4"/>
+        </page>
+    </xpath>
+    <xpath expr="/form/notebook" position="after">
+        <group col="5" colspan="4" id="buttons">
+            <label name="state"/>
+            <field name="state"/>
+            <button name="done" string="Done" icon="tryton-go-next"/>
+        </group>
+    </xpath>
+    <xpath expr="/form/notebook/page[@id=&quot;ambulatory_care_main&quot;]/field[@name=&quot;session_notes&quot;]" position="replace_attributes">
+        <field name="session_notes" height="50"/>
+    </xpath>
+</data>
new file mode 100644
--- /dev/null
+++ b/tryton/health_stock/view/create_prescription_stock_move.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<form string="Create Prescription Stock Move">
+    <separator string="Create Stock Move?" colspan="4" id="stock_move_ask"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_stock/view/gnuhealth_ambulatory_care_medical_supplies_tree.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<tree string="Medical Supplies">
+    <field name="product"/>
+    <field name="quantity"/>
+    <field name="lot"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_stock/view/gnuhealth_ambulatory_care_medicament_form.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<form string="Medicament">
+    <label name="medicament"/>
+    <field name="medicament"/>
+    <label name="quantity"/>
+    <field name="quantity"/>
+    <label name="lot"/>
+    <field name="lot"/>
+    <label name="short_comment"/>
+    <field name="short_comment"/>
+    <label name="product"/>
+    <field name="product"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_stock/view/gnuhealth_ambulatory_care_medicament_tree.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<tree string="Medicament">
+    <field name="medicament"/>
+    <field name="quantity"/>
+    <field name="lot"/>
+    <field name="short_comment" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_stock/view/gnuhealth_ambulatory_care_vaccine_form.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<form string="Vaccines">
+    <label name="vaccine"/>
+    <field name="vaccine"/>
+    <label name="quantity"/>
+    <field name="quantity"/>
+    <label name="lot"/>
+    <field name="lot"/>
+    <label name="dose"/>
+    <field name="dose"/>
+    <label name="next_dose_date"/>
+    <field name="next_dose_date"/>
+    <label name="admin_route"/>
+    <field name="admin_route"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_stock/view/gnuhealth_ambulatory_care_vaccine_tree.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<tree string="Vaccines">
+    <field name="vaccine"/>
+    <field name="quantity"/>
+    <field name="lot"/>
+    <field name="dose"/>
+    <field name="next_dose_date"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_stock/view/gnuhealth_medicament_tree_stock.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<data>
+    <xpath expr="/tree/field[@name=&quot;category&quot;]" position="after">
+        <field name="quantity"/>
+    </xpath>
+</data>
new file mode 100644
--- /dev/null
+++ b/tryton/health_stock/view/gnuhealth_patient_ambulatory_care_tree.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<data>
+    <xpath expr="/tree/field[@name=&quot;evolution&quot;]" position="after">
+        <field name="state"/>
+    </xpath>
+</data>
new file mode 100644
--- /dev/null
+++ b/tryton/health_stock/view/gnuhealth_patient_rounding.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<data>
+    <xpath expr="/form/notebook/page[@id=&quot;rounding_procedures&quot;]" position="after">
+        <page string="Medication" id="medication">
+            <label name="hospitalization_location"/>
+            <field name="hospitalization_location"/>
+            <field name="medicaments" colspan="4" view_ids="health_stock.gnuhealth_rounding_medicament_tree"/>
+            <field name="medical_supplies" colspan="4" view_ids="health_stock.gnuhealth_rounding_medical_supply_tree"/>
+            <field name="vaccines" colspan="4" view_ids="health_stock.gnuhealth_rounding_vaccine_tree"/>
+        </page>
+        <page string="Stock Moves" id="Stock Moves">
+            <field name="moves" colspan="4"/>
+        </page>
+    </xpath>
+    <xpath expr="/form/notebook" position="after">
+        <group col="5" colspan="4" id="buttons">
+            <label name="state"/>
+            <field name="state"/>
+            <button name="done" string="Done" icon="tryton-go-next"/>
+        </group>
+    </xpath>
+    <xpath expr="/form/notebook/page[@id=&quot;rounding_main&quot;]/field[@name=&quot;round_summary&quot;]" position="replace_attributes">
+        <field name="round_summary" height="50"/>
+    </xpath>
+    <xpath expr="/form/notebook/page[@id=&quot;rounding_main&quot;]/group[@id=&quot;the_six_p_wiew&quot;]" position="replace_attributes">
+        <group colspan="4" col="12" id="the_six_p_wiew" string="Six P's"/>
+    </xpath>
+</data>
new file mode 100644
--- /dev/null
+++ b/tryton/health_stock/view/gnuhealth_patient_rounding_tree.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<data>
+    <xpath expr="/tree/field[@name=&quot;evolution&quot;]" position="after">
+        <field name="state"/>
+    </xpath>
+</data>
new file mode 100644
--- /dev/null
+++ b/tryton/health_stock/view/gnuhealth_rounding_medical_supply_tree.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<tree string="Medical Supplies">
+    <field name="product"/>
+    <field name="quantity"/>
+    <field name="lot"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_stock/view/gnuhealth_rounding_medicament_form.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<form string="Medicament">
+    <label name="medicament"/>
+    <field name="medicament"/>
+    <label name="quantity"/>
+    <field name="quantity"/>
+    <label name="lot"/>
+    <field name="lot"/>
+    <label name="short_comment"/>
+    <field name="short_comment"/>
+    <label name="product"/>
+    <field name="product"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_stock/view/gnuhealth_rounding_medicament_tree.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<tree string="Medicament">
+    <field name="medicament"/>
+    <field name="quantity"/>
+    <field name="lot"/>
+    <field name="short_comment" expand="1"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_stock/view/gnuhealth_rounding_vaccine_form.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<form string="Vaccines">
+    <label name="vaccine"/>
+    <field name="vaccine"/>
+    <label name="quantity"/>
+    <field name="quantity"/>
+    <label name="lot"/>
+    <field name="lot"/>
+    <label name="dose"/>
+    <field name="dose"/>
+    <label name="next_dose_date"/>
+    <field name="next_dose_date"/>
+    <label name="admin_route"/>
+    <field name="admin_route"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_stock/view/gnuhealth_rounding_vaccine_tree.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<tree string="Vaccines">
+    <field name="vaccine"/>
+    <field name="quantity"/>
+    <field name="lot"/>
+    <field name="dose"/>
+    <field name="next_dose_date"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_stock/view/lot_form.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<data>
+    <xpath expr="/form/field[@name=&quot;product&quot;]" position="after">
+        <label name="expiration_date"/>
+        <field name="expiration_date"/>
+        <label name="quantity"/>
+        <field name="quantity"/>
+    </xpath>
+</data>
new file mode 100644
--- /dev/null
+++ b/tryton/health_stock/view/lot_tree.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<data>
+    <xpath expr="/tree/field[@name=&quot;product&quot;]" position="after">
+        <field name="expiration_date"/>
+        <field name="quantity"/>
+    </xpath>
+</data>
new file mode 100644
--- /dev/null
+++ b/tryton/health_stock/view/move_form.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data>
+    <xpath expr="/form/label[@name='from_location']" position="before">
+        <label name="origin"/>
+        <field name="origin"/>
+        <newline/>
+    </xpath>
+</data>
new file mode 100644
--- /dev/null
+++ b/tryton/health_stock/view/move_tree.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<data>
+    <xpath expr="/tree/field[@name='from_location']" position="before">
+        <field name="origin"/>
+    </xpath>
+</data>
new file mode 100644
--- /dev/null
+++ b/tryton/health_stock/view/party_form.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<data>
+    <xpath expr="/form/notebook/page[@id=&quot;stock&quot;]/field[@name=&quot;supplier_location&quot;]" position="after">
+        <label name="warehouse"/>
+        <field name="warehouse"/>
+    </xpath>
+</data>
--- a/tryton/health_surgery/health_surgery_view.xml
+++ b/tryton/health_surgery/health_surgery_view.xml
@@ -16,55 +16,13 @@
         <record model="ir.ui.view" id="gnuhealth_rcri_form">
             <field name="model">gnuhealth.rcri</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="RCRI : Revised Cardiac Risk Index">
-                    <group id="rcri_header" col="6">
-                        <label name="patient"/>
-                        <field name="patient"/>
-                        <label name="health_professional"/>
-                        <field name="health_professional"/>
-                        <label name="rcri_date"/>
-                        <field name="rcri_date"/>
-                    </group>
-                    <newline/>
-                    <group id="rcri_score" col="6">
-                        <label name="rcri_high_risk_surgery"/>
-                        <field name="rcri_high_risk_surgery"/>
-                        <label name="rcri_ischemic_history"/>
-                        <field name="rcri_ischemic_history"/>
-                        <label name="rcri_congestive_history"/>
-                        <field name="rcri_congestive_history"/>
-                        <label name="rcri_diabetes_history"/>
-                        <field name="rcri_diabetes_history"/>
-                        <label name="rcri_cerebrovascular_history"/>
-                        <field name="rcri_cerebrovascular_history"/>
-                        <label name="rcri_kidney_history"/>
-                        <field name="rcri_kidney_history"/>
-                        <newline/>
-                        <separator id="separator_score" colspan="6"/>
-                        <newline/>
-                        <label name="rcri_total"/>
-                        <field name="rcri_total"/>
-                        <label name="rcri_class"/>
-                        <field name="rcri_class"/>
-                    </group>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_rcri_form</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_rcri_tree">
             <field name="model">gnuhealth.rcri</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string='RCRI'>
-                    <field name="rcri_total"/>
-                    <field name="rcri_class"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_rcri_tree</field>
         </record>
 
     <!-- Shortcut to the RCRI from the Patient -->
@@ -85,103 +43,13 @@
         <record model="ir.ui.view" id="gnuhealth_surgery_view">
             <field name="model">gnuhealth.surgery</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Surgery">
-
-                    <group colspan="4" col="8" id="group_surgery_header">
-                        <label name="patient"/>
-                        <field name="patient"/>
-                        <label name="surgery_date"/>
-                        <field name="surgery_date"/>
-                        <label name="computed_age"/>
-                        <field name="computed_age"/>
-                        <label name="code"/>
-                        <field name="code"/>
-
-                    <newline/>
-
-                        <label name="description"/>
-                        <field name="description"/>
-                        <label name="pathology"/>
-                        <field name="pathology"/>
-                        <label name="classification"/>
-                        <field name="classification"/>
-                        <label name="operating_room"/>
-                        <field name="operating_room"/>
-                    </group>
-
-                    <newline/>
-
-                    <group colspan="4" id="group_surgery_1">
-                        <label name="surgeon"/>
-                        <field name="surgeon"/>
-                        <label name="anesthetist"/>
-                        <field name="anesthetist"/>
-                    </group>
-                    <newline/>
-
-                    <group string="Patient Surgical Risk assessment" id="group_patient_surgery_risk" colspan="4" col="6">
-                        <label name="preop_asa"/>
-                        <field name="preop_asa" width="150"/>
-                        <label name="preop_rcri"/>
-                        <field name="preop_rcri"/>
-                        <label name="preop_mallampati"/>
-                        <field name="preop_mallampati" width="150"/>
-                    </group>
-                    <newline/>
-                
-                    <group string="Preoperative checklist" id="group_preoperative_checklist" colspan="4" col="10">
-                        <label name="preop_bleeding_risk"/>
-                        <field name="preop_bleeding_risk"/>
-                        <label name="preop_oximeter"/>
-                        <field name="preop_oximeter"/>
-                        <label name="preop_site_marking"/>
-                        <field name="preop_site_marking"/>
-                        <label name="preop_antibiotics"/>
-                        <field name="preop_antibiotics"/>
-                        <label name="preop_sterility"/>
-                        <field name="preop_sterility"/>
-                    </group>
-                    <newline/>
-
-                    <separator id="surgery_separator_1" colspan="4"/>
-                    <field name="procedures" colspan="4"/>
-                    <newline/>
-                    <separator string="Details / Incidents" id="separator_surgery_details" colspan="2"/>
-                    <separator string="Anesthesia" id="separator_anesthesia_details" colspan="2"/>
-                    <newline/>
-                    <field name="extra_info" colspan="2"/>
-                    <field name="anesthesia_report" colspan="2"/>
-                    <newline/>
-
-                    <label name="surgery_end_date"/>
-                    <field name="surgery_end_date"/>
-                    <label name="surgery_length"/>
-                    <field name="surgery_length"/>
-
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_surgery</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_surgery_tree">
             <field name="model">gnuhealth.surgery</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string='Surgery'>
-                    <field name="patient"/>
-                    <field name="description"/>
-                    <field name="pathology"/>
-                    <field name="classification"/>
-                    <field name="surgery_date"/>
-                    <field name="surgery_length"/>
-                    <field name="operating_room"/>
-                    <field name="computed_age"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_surgery_tree</field>
         </record>
 
 <!-- Surgery Menu -->
@@ -226,29 +94,13 @@
         <record model="ir.ui.view" id="gnuhealth_procedure_view">
             <field name="model">gnuhealth.procedure</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Procedure">
-                    <label name="name"/>
-                    <field name="name"/>
-                    <label name="description"/>
-                    <field name="description"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_procedure</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_procedure_tree">
             <field name="model">gnuhealth.procedure</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string='Procedure'>
-                    <field name="name"/>
-                    <field name="description"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_procedure_tree</field>
         </record>
 
 <!-- Operation -->
@@ -256,31 +108,13 @@
         <record model="ir.ui.view" id="gnuhealth_operation_view">
             <field name="model">gnuhealth.operation</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Procedure">
-                    <label name="procedure"/>
-                    <field name="procedure"/>
-                    <newline/>
-                    <separator string="Procedure Details / Incidents" colspan="4" id="separator_surgery_op_details"/>
-                    <newline/>
-                    <field name="notes" colspan="4"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_operation</field>
         </record>
 
         <record model="ir.ui.view" id="gnuhealth_operation_tree">
             <field name="model">gnuhealth.operation</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string='Operation'>
-                    <field name="procedure" expand="1"/>
-                    <field name="notes"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_operation_tree</field>
         </record>
 
 <!-- Include the Surgery page into the Patient History -->
@@ -289,21 +123,7 @@
             <field name="model">gnuhealth.patient</field>
             <field name="inherit" ref="health.gnuhealth_patient_view_form"/>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/form/notebook/page[@id=&quot;patient_diseases&quot;]"
-                        position="after">
-
-                        <page string="Surgeries" id="page_surgery">
-                            <field name="surgery" colspan="4"/>
-                        </page>
-
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">gnuhealth_patient</field>
         </record>
 
     </data>
--- a/tryton/health_surgery/setup.py
+++ b/tryton/health_surgery/setup.py
@@ -60,7 +60,8 @@
     package_data={
         'trytond.modules.health_surgery': info.get('xml', []) \
             + info.get('translation', []) \
-            + ['tryton.cfg', 'doc/*.rst', 'locale/*.po', 'report/*.odt', 'icons/*.svg'],
+            + ['tryton.cfg', 'view/*.xml', 'doc/*.rst', 'locale/*.po',
+               'report/*.odt', 'icons/*.svg'],
         },
 
     classifiers=[
new file mode 100644
--- /dev/null
+++ b/tryton/health_surgery/view/gnuhealth_operation.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<form string="Procedure">
+    <label name="procedure"/>
+    <field name="procedure"/>
+    <newline/>
+    <separator string="Procedure Details / Incidents" colspan="4" id="separator_surgery_op_details"/>
+    <newline/>
+    <field name="notes" colspan="4"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_surgery/view/gnuhealth_operation_tree.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<tree string="Operation">
+    <field name="procedure" expand="1"/>
+    <field name="notes"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_surgery/view/gnuhealth_patient.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data>
+    <xpath expr="/form/notebook/page[@id=&quot;patient_diseases&quot;]" position="after">
+        <page string="Surgeries" id="page_surgery">
+            <field name="surgery" colspan="4"/>
+        </page>
+    </xpath>
+</data>
new file mode 100644
--- /dev/null
+++ b/tryton/health_surgery/view/gnuhealth_procedure.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<form string="Procedure">
+    <label name="name"/>
+    <field name="name"/>
+    <label name="description"/>
+    <field name="description"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_surgery/view/gnuhealth_procedure_tree.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<tree string="Procedure">
+    <field name="name"/>
+    <field name="description"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_surgery/view/gnuhealth_rcri_form.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<form string="RCRI : Revised Cardiac Risk Index">
+    <group id="rcri_header" col="6">
+        <label name="patient"/>
+        <field name="patient"/>
+        <label name="health_professional"/>
+        <field name="health_professional"/>
+        <label name="rcri_date"/>
+        <field name="rcri_date"/>
+    </group>
+    <newline/>
+    <group id="rcri_score" col="6">
+        <label name="rcri_high_risk_surgery"/>
+        <field name="rcri_high_risk_surgery"/>
+        <label name="rcri_ischemic_history"/>
+        <field name="rcri_ischemic_history"/>
+        <label name="rcri_congestive_history"/>
+        <field name="rcri_congestive_history"/>
+        <label name="rcri_diabetes_history"/>
+        <field name="rcri_diabetes_history"/>
+        <label name="rcri_cerebrovascular_history"/>
+        <field name="rcri_cerebrovascular_history"/>
+        <label name="rcri_kidney_history"/>
+        <field name="rcri_kidney_history"/>
+        <newline/>
+        <separator id="separator_score" colspan="6"/>
+        <newline/>
+        <label name="rcri_total"/>
+        <field name="rcri_total"/>
+        <label name="rcri_class"/>
+        <field name="rcri_class"/>
+    </group>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_surgery/view/gnuhealth_rcri_tree.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<tree string="RCRI">
+    <field name="rcri_total"/>
+    <field name="rcri_class"/>
+</tree>
new file mode 100644
--- /dev/null
+++ b/tryton/health_surgery/view/gnuhealth_surgery.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+<form string="Surgery">
+    <group colspan="4" col="8" id="group_surgery_header">
+        <label name="patient"/>
+        <field name="patient"/>
+        <label name="surgery_date"/>
+        <field name="surgery_date"/>
+        <label name="computed_age"/>
+        <field name="computed_age"/>
+        <label name="code"/>
+        <field name="code"/>
+        <newline/>
+        <label name="description"/>
+        <field name="description"/>
+        <label name="pathology"/>
+        <field name="pathology"/>
+        <label name="classification"/>
+        <field name="classification"/>
+        <label name="operating_room"/>
+        <field name="operating_room"/>
+    </group>
+    <newline/>
+    <group colspan="4" id="group_surgery_1">
+        <label name="surgeon"/>
+        <field name="surgeon"/>
+        <label name="anesthetist"/>
+        <field name="anesthetist"/>
+    </group>
+    <newline/>
+    <group string="Patient Surgical Risk assessment" id="group_patient_surgery_risk" colspan="4" col="6">
+        <label name="preop_asa"/>
+        <field name="preop_asa" width="150"/>
+        <label name="preop_rcri"/>
+        <field name="preop_rcri"/>
+        <label name="preop_mallampati"/>
+        <field name="preop_mallampati" width="150"/>
+    </group>
+    <newline/>
+    <group string="Preoperative checklist" id="group_preoperative_checklist" colspan="4" col="10">
+        <label name="preop_bleeding_risk"/>
+        <field name="preop_bleeding_risk"/>
+        <label name="preop_oximeter"/>
+        <field name="preop_oximeter"/>
+        <label name="preop_site_marking"/>
+        <field name="preop_site_marking"/>
+        <label name="preop_antibiotics"/>
+        <field name="preop_antibiotics"/>
+        <label name="preop_sterility"/>
+        <field name="preop_sterility"/>
+    </group>
+    <newline/>
+    <separator id="surgery_separator_1" colspan="4"/>
+    <field name="procedures" colspan="4"/>
+    <newline/>
+    <separator string="Details / Incidents" id="separator_surgery_details" colspan="2"/>
+    <separator string="Anesthesia" id="separator_anesthesia_details" colspan="2"/>
+    <newline/>
+    <field name="extra_info" colspan="2"/>
+    <field name="anesthesia_report" colspan="2"/>
+    <newline/>
+    <label name="surgery_end_date"/>
+    <field name="surgery_end_date"/>
+    <label name="surgery_length"/>
+    <field name="surgery_length"/>
+</form>
new file mode 100644
--- /dev/null
+++ b/tryton/health_surgery/view/gnuhealth_surgery_tree.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<tree string="Surgery">
+    <field name="patient"/>
+    <field name="description"/>
+    <field name="pathology"/>
+    <field name="classification"/>
+    <field name="surgery_date"/>
+    <field name="surgery_length"/>
+    <field name="operating_room"/>
+    <field name="computed_age"/>
+</tree>